|
@@ -125,18 +125,18 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
int result = manualEntryFreight(payable, payableManualDto);
|
|
int result = manualEntryFreight(payable, payableManualDto);
|
|
|
//2.保存待付/代收运费明细
|
|
//2.保存待付/代收运费明细
|
|
|
WalletPayableBalance payableBalance = buildWalletManualPayableBalance(payable, payableManualDto);
|
|
WalletPayableBalance payableBalance = buildWalletManualPayableBalance(payable, payableManualDto);
|
|
|
- walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
|
|
|
|
|
|
|
+ walletPayableBalanceMapper.insert(payableBalance);
|
|
|
//3.保存凭证相关文件
|
|
//3.保存凭证相关文件
|
|
|
List<String> voucherFiles = payableManualDto.getVoucherFiles();
|
|
List<String> voucherFiles = payableManualDto.getVoucherFiles();
|
|
|
if (!CollectionUtils.isEmpty(voucherFiles)) {
|
|
if (!CollectionUtils.isEmpty(voucherFiles)) {
|
|
|
- List<WalletBusinessFile> list = new ArrayList<>(voucherFiles.size());
|
|
|
|
|
voucherFiles.forEach(e -> {
|
|
voucherFiles.forEach(e -> {
|
|
|
WalletBusinessFile file = new WalletBusinessFile();
|
|
WalletBusinessFile file = new WalletBusinessFile();
|
|
|
file.setBusinessId(payableBalance.getId());
|
|
file.setBusinessId(payableBalance.getId());
|
|
|
file.setFilePath(e);
|
|
file.setFilePath(e);
|
|
|
- list.add(file);
|
|
|
|
|
|
|
+ file.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
+ file.setCreateTime(LocalDateTime.now());
|
|
|
|
|
+ businessFileMapper.insert(file);
|
|
|
});
|
|
});
|
|
|
- businessFileMapper.insertBatch(list);
|
|
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -154,7 +154,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
//付款中运费
|
|
//付款中运费
|
|
|
existedPayable.setPayingFreight(existedPayable.getPayingFreight().add(payableManualDto.getTradeAmount()));
|
|
existedPayable.setPayingFreight(existedPayable.getPayingFreight().add(payableManualDto.getTradeAmount()));
|
|
|
}
|
|
}
|
|
|
- result = walletPayableMapper.updateWalletPayable(existedPayable);
|
|
|
|
|
|
|
+ result = walletPayableMapper.updateById(existedPayable);
|
|
|
BeanUtils.copyProperties(existedPayable, payable);
|
|
BeanUtils.copyProperties(existedPayable, payable);
|
|
|
} else {
|
|
} else {
|
|
|
// 如果不存在,则新增一条待履约/预付数据
|
|
// 如果不存在,则新增一条待履约/预付数据
|
|
@@ -165,7 +165,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payable.setFreight(payableManualDto.getTradeAmount());
|
|
payable.setFreight(payableManualDto.getTradeAmount());
|
|
|
payable.setTradingFreight(BigDecimal.ZERO);
|
|
payable.setTradingFreight(BigDecimal.ZERO);
|
|
|
payable.setPayingFreight(BigDecimal.ZERO);
|
|
payable.setPayingFreight(BigDecimal.ZERO);
|
|
|
- result = walletPayableMapper.insertWalletPayable(payable);
|
|
|
|
|
|
|
+ result = walletPayableMapper.insert(payable);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
@@ -201,7 +201,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payable.setFreight(payableAddDto.getTradeAmount());
|
|
payable.setFreight(payableAddDto.getTradeAmount());
|
|
|
payable.setTradingFreight(payableAddDto.getTradeAmount());
|
|
payable.setTradingFreight(payableAddDto.getTradeAmount());
|
|
|
payable.setPayingFreight(payableAddDto.getTradeAmount());
|
|
payable.setPayingFreight(payableAddDto.getTradeAmount());
|
|
|
- result = walletPayableMapper.insertWalletPayable(payable);
|
|
|
|
|
|
|
+ result = walletPayableMapper.insert(payable);
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -243,9 +243,9 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
//其他
|
|
//其他
|
|
|
throw new BusinessException("交易类型不支持");
|
|
throw new BusinessException("交易类型不支持");
|
|
|
}
|
|
}
|
|
|
- result = walletPayableMapper.updateWalletPayable(existedPayable);
|
|
|
|
|
|
|
+ result = walletPayableMapper.updateById(existedPayable);
|
|
|
WalletPayableBalance payableBalance = buildWalletUpdatePayableBalance(existedPayable, payableUpdateDto);
|
|
WalletPayableBalance payableBalance = buildWalletUpdatePayableBalance(existedPayable, payableUpdateDto);
|
|
|
- walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
|
|
|
|
|
|
|
+ walletPayableBalanceMapper.insert(payableBalance);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -271,7 +271,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
public int applyPay(WalletPayableApplyPayDto applyPayDto) {
|
|
public int applyPay(WalletPayableApplyPayDto applyPayDto) {
|
|
|
//todo 校验验证码
|
|
//todo 校验验证码
|
|
|
//根据运费清单查询待付代收运费记录
|
|
//根据运费清单查询待付代收运费记录
|
|
|
- WalletPayable walletPayable = walletPayableMapper.selectWalletPayableById(applyPayDto.getPayableId());
|
|
|
|
|
|
|
+ WalletPayable walletPayable = walletPayableMapper.selectById(applyPayDto.getPayableId());
|
|
|
//非空校验
|
|
//非空校验
|
|
|
if (walletPayable == null) {
|
|
if (walletPayable == null) {
|
|
|
throw new BusinessException("待付/代收运费清单不存在");
|
|
throw new BusinessException("待付/代收运费清单不存在");
|
|
@@ -282,14 +282,14 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
}
|
|
}
|
|
|
walletPayable.setFreight(walletPayable.getFreight().subtract(applyPayDto.getApplyAmount()));
|
|
walletPayable.setFreight(walletPayable.getFreight().subtract(applyPayDto.getApplyAmount()));
|
|
|
walletPayable.setPayingFreight(walletPayable.getPayingFreight().add(applyPayDto.getApplyAmount()));
|
|
walletPayable.setPayingFreight(walletPayable.getPayingFreight().add(applyPayDto.getApplyAmount()));
|
|
|
- walletPayableMapper.updateWalletPayable(walletPayable);
|
|
|
|
|
|
|
+ walletPayableMapper.updateById(walletPayable);
|
|
|
//构建申请付款记录
|
|
//构建申请付款记录
|
|
|
WalletPayableApply payableApply = buildWalletPayableApply(walletPayable, applyPayDto);
|
|
WalletPayableApply payableApply = buildWalletPayableApply(walletPayable, applyPayDto);
|
|
|
//新增待付代收运费明细
|
|
//新增待付代收运费明细
|
|
|
WalletPayableBalance payableBalance = buildWalletApplyPayableBalance(walletPayable, payableApply);
|
|
WalletPayableBalance payableBalance = buildWalletApplyPayableBalance(walletPayable, payableApply);
|
|
|
- walletPayableBalanceMapper.insertWalletPayableBalance(payableBalance);
|
|
|
|
|
|
|
+ walletPayableBalanceMapper.insert(payableBalance);
|
|
|
//插入申请付款记录
|
|
//插入申请付款记录
|
|
|
- return walletPayableApplyMapper.insertWalletPayableApply(payableApply);
|
|
|
|
|
|
|
+ return walletPayableApplyMapper.insert(payableApply);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private WalletPayableBalance buildWalletApplyPayableBalance(WalletPayable payable, WalletPayableApply freightApply) {
|
|
private WalletPayableBalance buildWalletApplyPayableBalance(WalletPayable payable, WalletPayableApply freightApply) {
|
|
@@ -343,7 +343,7 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
walletPayablePayMapper.insert(walletPayablePay);
|
|
walletPayablePayMapper.insert(walletPayablePay);
|
|
|
//修改申请记录
|
|
//修改申请记录
|
|
|
payableApply.setPayingAmount(walletPayablePay.getApplyAmount());
|
|
payableApply.setPayingAmount(walletPayablePay.getApplyAmount());
|
|
|
- walletPayableApplyMapper.updateWalletPayableApply(payableApply);
|
|
|
|
|
|
|
+ walletPayableApplyMapper.updateById(payableApply);
|
|
|
WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
|
|
WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
|
|
|
PayRes data = JSONObject.parseObject(walletPayablePay.getData(), PayRes.class);
|
|
PayRes data = JSONObject.parseObject(walletPayablePay.getData(), PayRes.class);
|
|
|
walletPayAddRes.setId(walletPayablePay.getId());
|
|
walletPayAddRes.setId(walletPayablePay.getId());
|
|
@@ -488,12 +488,12 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
if (payableApply.getApplyAmount().compareTo(payableApply.getReceivedAmount()) == 0) {
|
|
if (payableApply.getApplyAmount().compareTo(payableApply.getReceivedAmount()) == 0) {
|
|
|
payableApply.setStatus(1);
|
|
payableApply.setStatus(1);
|
|
|
}
|
|
}
|
|
|
- walletPayableApplyMapper.updateWalletPayableApply(payableApply);
|
|
|
|
|
|
|
+ walletPayableApplyMapper.updateById(payableApply);
|
|
|
//5.运费清单付款中金额扣减
|
|
//5.运费清单付款中金额扣减
|
|
|
walletPayable.setPayingFreight(walletPayable.getPayingFreight().subtract(receivedCallbackDto.getTranAmt()));
|
|
walletPayable.setPayingFreight(walletPayable.getPayingFreight().subtract(receivedCallbackDto.getTranAmt()));
|
|
|
- walletPayableMapper.updateWalletPayable(walletPayable);
|
|
|
|
|
|
|
+ walletPayableMapper.updateById(walletPayable);
|
|
|
//6.运费明细插入记录
|
|
//6.运费明细插入记录
|
|
|
- walletPayableBalanceMapper.insertWalletPayableBalance(buildWalletReceivedPayableBalance(walletPayable, walletPayablePay));
|
|
|
|
|
|
|
+ walletPayableBalanceMapper.insert(buildWalletReceivedPayableBalance(walletPayable, walletPayablePay));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|