From 5431e81191635feb51d7de2cd433c0bec21a0427 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Mar 2025 16:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=80=80=E6=AC=BE=E5=89=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/PayServiceImpl.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index f4a89cbf..009242ee 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -408,10 +408,10 @@ public class PayServiceImpl implements PayService { AssertUtil.isNull(shopUser, "该店铺用户不存在"); ShopUserFlow inFlow = userFlowService.getById(payParam.getFlowId()); AssertUtil.isNull(inFlow, "充值记录不存在"); - ShopUserFlow giftFlow = userFlowService.queryChain() - .eq(ShopUserFlow::getRelationId, payParam.getFlowId()) - .eq(ShopUserFlow::getBizCode, ShopUserFlowBizEnum.AWARD_IN.getCode()) - .one(); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(ShopUserFlow::getRelationId, payParam.getFlowId()); + queryWrapper.eq(ShopUserFlow::getBizCode, ShopUserFlowBizEnum.AWARD_IN.getCode()); + ShopUserFlow giftFlow = userFlowService.getOne(queryWrapper); resultMap.put("amount", shopUser.getAmount()); resultMap.put("inAmount", inFlow.getAmount()); resultMap.put("inRefundAmount", inFlow.getRefundAmount()); @@ -423,14 +423,12 @@ public class PayServiceImpl implements PayService { @Override public CzgResult refundVip(VipRefundDTO refPayParam) { ShopUser shopUser = shopUserService.getShopUserInfo(refPayParam.getShopId(), refPayParam.getUserId()); - ShopUserFlow inFlow = userFlowService.queryChain().select() - .eq(ShopUserFlow::getId, refPayParam.getFlowId()).one(); + ShopUserFlow inFlow = userFlowService.getById(refPayParam.getFlowId()); AssertUtil.isNull(inFlow, "充值记录不存在"); - ShopUserFlow giftFlow = userFlowService.queryChain().select() - .eq(ShopUserFlow::getRelationId, refPayParam.getFlowId()) - .eq(ShopUserFlow::getBizCode, ShopUserFlowBizEnum.AWARD_IN.getCode()) - .one(); - + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(ShopUserFlow::getRelationId, refPayParam.getFlowId()); + queryWrapper.eq(ShopUserFlow::getBizCode, ShopUserFlowBizEnum.AWARD_IN.getCode()); + ShopUserFlow giftFlow = userFlowService.getOne(queryWrapper); if ((inFlow.getAmount().subtract(inFlow.getRefundAmount())).compareTo(refPayParam.getRefAmount()) < 0) { return CzgResult.failure("退款失败，退款金额不可大于可退金额"); }