Browse Source

3.16 现金退款提交分配地区

milestone-20260224-现金钱包
huangqizhen 3 weeks ago
parent
commit
90d2bdfbbd
  1. 2
      src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java
  2. 7
      src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

2
src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java

@ -204,5 +204,7 @@ public class CashRecordRefund {
private Integer partRefundFree; private Integer partRefundFree;
private BigDecimal handlingCharge; private BigDecimal handlingCharge;
private String payType; private String payType;
private String receivedMarket;
private Integer walletId;
} }

7
src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@ -70,6 +70,8 @@ public class CashRefundServiceImpl implements RefundService {
private TranslationService translationService; private TranslationService translationService;
@Autowired @Autowired
private WalletMapper walletMapper; private WalletMapper walletMapper;
@Autowired
private UserMapper userMapper;
@Override @Override
public PageInfo<CashRecordDTO> select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { public PageInfo<CashRecordDTO> select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) {
@ -224,6 +226,9 @@ public class CashRefundServiceImpl implements RefundService {
{ {
wallet = 8; wallet = 8;
} }
if (payType.equals("银行转账")||payType.equals("现金")||payType.equals("支票")||payType.equals("刷卡")){
wallet=cashRecordRefund.getWalletId();
}
UserRegionWallet userRegionWallet = walletMapper.selectWallet(cashRecordRefund.getJwcode(), wallet); UserRegionWallet userRegionWallet = walletMapper.selectWallet(cashRecordRefund.getJwcode(), wallet);
if (userRegionWallet == null) { if (userRegionWallet == null) {
@ -771,7 +776,7 @@ public class CashRefundServiceImpl implements RefundService {
String payType = cashRecordRefund.getPayType(); String payType = cashRecordRefund.getPayType();
Integer wallet = null; Integer wallet = null;
if (payType == null || payType.trim().isEmpty()) { if (payType == null || payType.trim().isEmpty()) {
throw new SystemException("未穿输支付方式");
throw new SystemException("未输支付方式");
} }
if (payType.equals("Stripe")||payType.equals("PaymentAsia")) if (payType.equals("Stripe")||payType.equals("PaymentAsia"))
{ {

Loading…
Cancel
Save