From f42ab0d8b969f9fe85490b235895162b1c6cf32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 14:24:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E4=B8=BAnull=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/PayService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 489a943..5921213 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1297,7 +1297,7 @@ public class PayService { throw new MsgException("退款金额必须大于0"); } - oldOrderInfo.setCouponInfoList(JSONObject.toJSONString(couponInfoDTO)); + oldOrderInfo.setCouponInfoList(couponInfoDTO == null ? null : JSONObject.toJSONString(couponInfoDTO)); // 保存剩余未退款的订单详情 if (!remainOrderDetailList.isEmpty()) { From f243d83de8df7cb11579eba3d3bbd6d6823185e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 14:25:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E4=B8=BAnull=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/PayService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 5921213..76becb5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1500,8 +1500,10 @@ public class PayService { if (count == 0) { returnCoupon(orderInfo, true); // 返还积分 - memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(), - "用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId())); + if (orderInfo.getMemberId() != null) { + memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(), + "用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId())); + } } } mPOrderInfoMapper.updateById(orderInfo); From 2c69dcc4d3dd093fa3d20f0949b65886b4831ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 14:28:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/PayService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 76becb5..fa6c720 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1500,7 +1500,7 @@ public class PayService { if (count == 0) { returnCoupon(orderInfo, true); // 返还积分 - if (orderInfo.getMemberId() != null) { + if (orderInfo.getMemberId() != null && orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) { memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(), "用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId())); } From c815a7b061c9d9ce871e658e0a8015ab09ad3cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 14:42:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/OrderController.java | 1 - .../system/cashierservice/controller/PayController.java | 2 +- .../chaozhanggui/system/cashierservice/service/PayService.java | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index 436b46c..d04755b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -139,7 +139,6 @@ public class OrderController { JSONObject jsonObject = TokenUtil.parseParamFromToken(token); String userId = jsonObject.getString("accountId"); orderVo.setMerchantId(Integer.valueOf(userId)); - orderVo.setUserId(jsonObject.getString("staffId")); return orderService.createOrder(orderVo, clientType, token, null); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 87c7fa0..99416e8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -238,7 +238,7 @@ public class PayController { } @RequestMapping("returnOrder") - @LimitSubmit(key = "returnOrder:%s", limit = 10) +// @LimitSubmit(key = "returnOrder:%s", limit = 10) public Result returnOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName, @RequestHeader("clientType") String clientType, diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index fa6c720..4b1eed4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -941,6 +941,7 @@ public class PayService { orderInfo.setStatus("closed"); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); orderInfo.setMemberId(vipUserId.toString()); + orderInfo.setUserId(shopUser.getUserId()); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); //更新购物车状态 mpCashierCartService.updateStateByOrderId(TableConstant.OrderInfo.Status.CLOSED, orderInfo.getId()); @@ -1399,7 +1400,7 @@ public class PayService { } - @Transactional + @Transactional(rollbackFor = Exception.class) public Object returnOrder(ReturnOrderDTO returnOrderDTO) { TbOrderInfo orderInfo = mPOrderInfoMapper.selectOne(new LambdaQueryWrapper() .eq(TbOrderInfo::getId, returnOrderDTO.getOrderId()) From b88509133c7a5773160c8ce8d0793ae1450ec62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 14:42:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/PayController.java | 2 +- .../system/cashierservice/service/PayService.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 99416e8..87c7fa0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -238,7 +238,7 @@ public class PayController { } @RequestMapping("returnOrder") -// @LimitSubmit(key = "returnOrder:%s", limit = 10) + @LimitSubmit(key = "returnOrder:%s", limit = 10) public Result returnOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName, @RequestHeader("clientType") String clientType, diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 4b1eed4..a6ec140 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1253,7 +1253,7 @@ public class PayService { hasNormalReturn = true; saleAmount = saleAmount.add(orderDetail.getPrice()); if (remainNum.compareTo(BigDecimal.ZERO) <= 0) { - returnAmount = orderDetail.getPriceAmount(); + returnAmount = returnAmount.add(orderDetail.getPriceAmount()); packAMount = orderDetail.getPackAmount(); } else { currentDetailAMount = orderDetail.getPriceAmount() @@ -1326,6 +1326,9 @@ public class PayService { returnOrder.setPayAmount(returnAmount); mPOrderInfoMapper.insert(returnOrder); + for (TbOrderDetail orderDetail : detailList) { + orderDetail.setOrderId(returnOrder.getId()); + } updateStockAndRecord(detailList); mpOrderDetailService.updateBatchById(detailList);