|
@@ -134,8 +134,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
WalletBusinessFile file = new WalletBusinessFile();
|
|
WalletBusinessFile file = new WalletBusinessFile();
|
|
|
file.setBusinessId(payableBalance.getId());
|
|
file.setBusinessId(payableBalance.getId());
|
|
|
file.setFilePath(e);
|
|
file.setFilePath(e);
|
|
|
- file.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- file.setCreateTime(new Date());
|
|
|
|
|
list.add(file);
|
|
list.add(file);
|
|
|
});
|
|
});
|
|
|
businessFileMapper.insertBatch(list);
|
|
businessFileMapper.insertBatch(list);
|
|
@@ -166,8 +164,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payable.setCarrierEntId(LoginUserHolder.getEntId());
|
|
payable.setCarrierEntId(LoginUserHolder.getEntId());
|
|
|
payable.setFreight(payableManualDto.getTradeAmount());
|
|
payable.setFreight(payableManualDto.getTradeAmount());
|
|
|
payable.setTradingFreight(BigDecimal.ZERO);
|
|
payable.setTradingFreight(BigDecimal.ZERO);
|
|
|
- payable.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- payable.setCreateTime(new Date());
|
|
|
|
|
payable.setPayingFreight(BigDecimal.ZERO);
|
|
payable.setPayingFreight(BigDecimal.ZERO);
|
|
|
result = walletPayableMapper.insertWalletPayable(payable);
|
|
result = walletPayableMapper.insertWalletPayable(payable);
|
|
|
}
|
|
}
|
|
@@ -189,8 +185,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
|
payableBalance.setRemark(payableManualDto.getRemark());
|
|
payableBalance.setRemark(payableManualDto.getRemark());
|
|
|
payableBalance.setVoucherFlag(CollectionUtils.isEmpty(payableManualDto.getVoucherFiles()) ? 0 : 1);
|
|
payableBalance.setVoucherFlag(CollectionUtils.isEmpty(payableManualDto.getVoucherFiles()) ? 0 : 1);
|
|
|
- payableBalance.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- payableBalance.setCreateTime(new Date());
|
|
|
|
|
return payableBalance;
|
|
return payableBalance;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -206,8 +200,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payable.setCarrierEntId(payableAddDto.getCarriageEntId());
|
|
payable.setCarrierEntId(payableAddDto.getCarriageEntId());
|
|
|
payable.setFreight(payableAddDto.getTradeAmount());
|
|
payable.setFreight(payableAddDto.getTradeAmount());
|
|
|
payable.setTradingFreight(payableAddDto.getTradeAmount());
|
|
payable.setTradingFreight(payableAddDto.getTradeAmount());
|
|
|
- payable.setCreateTime(new Date());
|
|
|
|
|
- payable.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
payable.setPayingFreight(payableAddDto.getTradeAmount());
|
|
payable.setPayingFreight(payableAddDto.getTradeAmount());
|
|
|
result = walletPayableMapper.insertWalletPayable(payable);
|
|
result = walletPayableMapper.insertWalletPayable(payable);
|
|
|
}
|
|
}
|
|
@@ -270,8 +262,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
|
payableBalance.setRemark(payableAddDto.getRemark());
|
|
payableBalance.setRemark(payableAddDto.getRemark());
|
|
|
- payableBalance.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- payableBalance.setCreateTime(new Date());
|
|
|
|
|
return payableBalance;
|
|
return payableBalance;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -312,8 +302,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payableBalance.setFreight(payable.getFreight());
|
|
payableBalance.setFreight(payable.getFreight());
|
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
|
- payableBalance.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- payableBalance.setCreateTime(new Date());
|
|
|
|
|
payableBalance.setRemark(freightApply.getRemark());
|
|
payableBalance.setRemark(freightApply.getRemark());
|
|
|
return payableBalance;
|
|
return payableBalance;
|
|
|
}
|
|
}
|
|
@@ -324,8 +312,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
apply.setOrderNo(IdUtil.getSnowflakeNextIdStr());
|
|
apply.setOrderNo(IdUtil.getSnowflakeNextIdStr());
|
|
|
apply.setApplyAmount(applyPayDto.getApplyAmount());
|
|
apply.setApplyAmount(applyPayDto.getApplyAmount());
|
|
|
apply.setRemark(applyPayDto.getRemark());
|
|
apply.setRemark(applyPayDto.getRemark());
|
|
|
- apply.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- apply.setCreateTime(new Date());
|
|
|
|
|
return apply;
|
|
return apply;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -420,8 +406,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payablePay.setOrderNo(IdUtil.getSnowflakeNextIdStr());
|
|
payablePay.setOrderNo(IdUtil.getSnowflakeNextIdStr());
|
|
|
payablePay.setApplyAmount(payableApply.getApplyAmount().subtract(payableApply.getPayingAmount().add(payableApply.getReceivedAmount())));
|
|
payablePay.setApplyAmount(payableApply.getApplyAmount().subtract(payableApply.getPayingAmount().add(payableApply.getReceivedAmount())));
|
|
|
payablePay.setReceivedAmount(BigDecimal.ZERO);
|
|
payablePay.setReceivedAmount(BigDecimal.ZERO);
|
|
|
- payablePay.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- payablePay.setCreateTime(new Date());
|
|
|
|
|
return payablePay;
|
|
return payablePay;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -486,10 +470,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
walletBusinessFile.setRemark("");
|
|
walletBusinessFile.setRemark("");
|
|
|
walletBusinessFile.setStatus(0);
|
|
walletBusinessFile.setStatus(0);
|
|
|
walletBusinessFile.setDelFlag(0);
|
|
walletBusinessFile.setDelFlag(0);
|
|
|
- walletBusinessFile.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- walletBusinessFile.setCreateTime(new Date());
|
|
|
|
|
- walletBusinessFile.setUpdateBy(LoginUserHolder.getUserId());
|
|
|
|
|
- walletBusinessFile.setUpdateTime(new Date());
|
|
|
|
|
MultipartFile file = receivedCallbackDto.getFile();
|
|
MultipartFile file = receivedCallbackDto.getFile();
|
|
|
BaseResult<FileInfoVO> httpResult = remoteFileService.fileUpload(file);
|
|
BaseResult<FileInfoVO> httpResult = remoteFileService.fileUpload(file);
|
|
|
if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
|
|
if (HttpStatus.SUCCESS_CODE == httpResult.getCode()) {
|
|
@@ -528,8 +508,6 @@ public class WalletPayableServiceImpl implements IWalletPayableService {
|
|
|
payableBalance.setFreight(payable.getFreight());
|
|
payableBalance.setFreight(payable.getFreight());
|
|
|
payableBalance.setTradingFreight(payable.getTradingFreight());
|
|
payableBalance.setTradingFreight(payable.getTradingFreight());
|
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
payableBalance.setPayingFreight(payable.getPayingFreight());
|
|
|
- payableBalance.setCreateTime(new Date());
|
|
|
|
|
- payableBalance.setCreateBy(LoginUserHolder.getUserId());
|
|
|
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
payableBalance.setStatus(ExecutionStatusEnum.SUCCESS.getCode());
|
|
|
return payableBalance;
|
|
return payableBalance;
|
|
|
}
|
|
}
|