From 90d2bdfbbd276eb968d5c692d70cef449b25d0cf Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Mon, 16 Mar 2026 19:22:56 +0800 Subject: [PATCH] =?UTF-8?q?3.16=20=E7=8E=B0=E9=87=91=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E9=85=8D=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/cash/CashRecordRefund.java | 2 ++ .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java index 4173a24..6a163ff 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java @@ -204,5 +204,7 @@ public class CashRecordRefund { private Integer partRefundFree; private BigDecimal handlingCharge; private String payType; + private String receivedMarket; + private Integer walletId; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 74187e8..18e3bba 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -70,6 +70,8 @@ public class CashRefundServiceImpl implements RefundService { private TranslationService translationService; @Autowired private WalletMapper walletMapper; + @Autowired + private UserMapper userMapper; @Override public PageInfo select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { @@ -224,6 +226,9 @@ public class CashRefundServiceImpl implements RefundService { { wallet = 8; } + if (payType.equals("银行转账")||payType.equals("现金")||payType.equals("支票")||payType.equals("刷卡")){ + wallet=cashRecordRefund.getWalletId(); + } UserRegionWallet userRegionWallet = walletMapper.selectWallet(cashRecordRefund.getJwcode(), wallet); if (userRegionWallet == null) { @@ -771,7 +776,7 @@ public class CashRefundServiceImpl implements RefundService { String payType = cashRecordRefund.getPayType(); Integer wallet = null; if (payType == null || payType.trim().isEmpty()) { - throw new SystemException("未穿输支付方式"); + throw new SystemException("未传输支付方式"); } if (payType.equals("Stripe")||payType.equals("PaymentAsia")) {