From 9f5b032ce12a89aa52cfc970ed78f4ee5fd449d0 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 25 Mar 2024 15:04:01 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=92=B1=E5=8C=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/api/uniapp/PayController.java | 4 ++-- .../pile/service/impl/MemberWalletInfoServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 6e2c5c687..fba58fcae 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -343,8 +343,8 @@ public class PayController extends BaseController { public void adapayCallback(HttpServletRequest request) { try { orderService.adapayCallback(request); - String type = request.getParameter("type"); - logger.info("1汇付回调type:{}", type); + // String type = request.getParameter("type"); + logger.info("1汇付回调type:{}", request.getParameter("type")); } catch (Exception e) { logger.error("1汇付支付回调失败 error", e); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java index 7cad90f05..fd147ac53 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java @@ -97,7 +97,7 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { MemberWalletVO memberWalletVO = memberWalletInfoMapper.selectMemberWalletInfo(walletCode); // 累计消费金额 = 累计充值 + 累计赠送 - 本金余额 - 赠送金余额 BigDecimal accumulatedConsumptionAmount = memberWalletVO.getAccumulatedRechargeAmount() - .add(memberWalletVO.getAccumulatedRechargeAmount()) + .add(memberWalletVO.getAccumulatedRechargeGift()) .subtract(memberWalletVO.getPrincipalBalance()) .subtract(memberWalletVO.getGiftBalance()); memberWalletVO.setAccumulatedConsumptionAmount(accumulatedConsumptionAmount);