From ad8c87d3139c5c99fd0928a7104d2c3faccab9fc Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 14:54:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/shopimpl/TbShopTableServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index ef17fb6c..82b93771 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -2033,7 +2033,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { } - private TbOrderInfo updateReturnOrderInfo(ReturnOrderDTO returnOrderDTO, TbOrderInfo oldOrderInfo, boolean isOnline) { + private HashMap updateReturnOrderInfo(ReturnOrderDTO returnOrderDTO, TbOrderInfo oldOrderInfo, boolean isOnline) { ArrayList detailIds = new ArrayList<>(); HashMap returnNumMap = new HashMap<>(); returnOrderDTO.getOrderDetails().forEach(item -> { @@ -2127,7 +2127,10 @@ public class TbShopTableServiceImpl implements TbShopTableService { updateStockAndRecord(detailList); mpOrderDetailService.updateBatchById(detailList); - return returnOrder; + HashMap data = new HashMap<>(); + data.put("returnOrder", returnOrder); + data.put("returnAmount", returnAmount); + return data; } private void updateStockAndRecord(List orderDetailList) { @@ -2187,7 +2190,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { // TODO 密码校验 } - TbOrderInfo returnOrderInfo = updateReturnOrderInfo(returnOrderDTO, orderInfo, true); + HashMap returnInfoData = updateReturnOrderInfo(returnOrderDTO, orderInfo, true); + TbOrderInfo returnOrderInfo = (TbOrderInfo) returnInfoData.get("returnOrder"); + BigDecimal returnAmount = (BigDecimal) returnInfoData.get("returnAmount"); String shopId = orderInfo.getShopId(); String payType = orderInfo.getPayType(); @@ -2199,7 +2204,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo.setStatus("refund"); // 储值卡支付退款 } else if ("deposit".equals(payType)) { - orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount()); + orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnAmount); orderInfo.setStatus("refund"); mpOrderDetailService.updateStatusByOrderIdAndIds(OrderStatusEnums.REFUNDING, OrderStatusEnums.REFUND, returnOrderDTO.getOrderId(), returnOrderDTO.getOrderDetails().stream().map(ReturnOrderDTO.OrderDetail::getId).collect(Collectors.toList())); From 04fab9ef26c3b93013b990d29a444d38efe5e669 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 15:10:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E7=A8=BF=E5=82=A8=E5=80=BC?= =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E4=BF=9D=E5=AD=98=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7id=E5=92=8C=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 4 ++-- .../cashier/service/impl/order/TbOrderInfoServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index 74cc1d91..c4b55781 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -438,8 +438,8 @@ public class TbPayServiceImpl implements TbPayService { orderInfo.setPayAmount(payMount); - orderInfo.setUserId(user.getId().toString()); - orderInfo.setMemberId(memberId); + orderInfo.setUserId(user.getUserId()); + orderInfo.setMemberId(user.getId().toString()); orderInfo.setPayType("deposit"); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); return orderInfo; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index 430b540f..532da077 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -592,7 +592,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { public void depositReturn(Integer userId, Integer shopId, BigDecimal returnAmount) { TbShopUser user = tbMShopUserMapper.selectOne(new LambdaQueryWrapper() .eq(TbShopUser::getShopId, shopId) - .eq(TbShopUser::getId, userId)); + .eq(TbShopUser::getUserId, userId)); if (user == null) { throw new BadRequestException("用户信息不存在"); }