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")) {