|
@@ -145,7 +145,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
int result = manualEntryPrepaid(prepaid, manualEntryDto);
|
|
int result = manualEntryPrepaid(prepaid, manualEntryDto);
|
|
|
//2.保存待履约/预付余额明细
|
|
//2.保存待履约/预付余额明细
|
|
|
WalletPrepaidBalance prepaidBalance = buildManualPrepaidBalance(prepaid, manualEntryDto);
|
|
WalletPrepaidBalance prepaidBalance = buildManualPrepaidBalance(prepaid, manualEntryDto);
|
|
|
- prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
|
|
|
|
|
|
|
+ prepaidBalanceMapper.insert(prepaidBalance);
|
|
|
//3.保存凭证相关文件
|
|
//3.保存凭证相关文件
|
|
|
List<String> voucherFiles = manualEntryDto.getVoucherFiles();
|
|
List<String> voucherFiles = manualEntryDto.getVoucherFiles();
|
|
|
if (!CollectionUtils.isEmpty(voucherFiles)) {
|
|
if (!CollectionUtils.isEmpty(voucherFiles)) {
|
|
@@ -172,14 +172,14 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
if (existedPrepaid != null) {
|
|
if (existedPrepaid != null) {
|
|
|
// 如果存在,则更新待履约/预付金额
|
|
// 如果存在,则更新待履约/预付金额
|
|
|
existedPrepaid.setPreBalance(existedPrepaid.getPreBalance().add(manualEntryDto.getTradeAmount()));
|
|
existedPrepaid.setPreBalance(existedPrepaid.getPreBalance().add(manualEntryDto.getTradeAmount()));
|
|
|
- result = walletPrepaidMapper.updateWalletPrepaid(existedPrepaid);
|
|
|
|
|
|
|
+ result = walletPrepaidMapper.updateById(existedPrepaid);
|
|
|
BeanUtils.copyProperties(existedPrepaid, walletPrepaid);
|
|
BeanUtils.copyProperties(existedPrepaid, walletPrepaid);
|
|
|
} else {
|
|
} else {
|
|
|
// 如果不存在,则新增一条待履约/预付数据
|
|
// 如果不存在,则新增一条待履约/预付数据
|
|
|
walletPrepaid.setSupEntId(LoginUserHolder.getEntId());
|
|
walletPrepaid.setSupEntId(LoginUserHolder.getEntId());
|
|
|
walletPrepaid.setProEntId(manualEntryDto.getTradeEntId());
|
|
walletPrepaid.setProEntId(manualEntryDto.getTradeEntId());
|
|
|
walletPrepaid.setPreBalance(manualEntryDto.getTradeAmount());
|
|
walletPrepaid.setPreBalance(manualEntryDto.getTradeAmount());
|
|
|
- result = walletPrepaidMapper.insertWalletPrepaid(walletPrepaid);
|
|
|
|
|
|
|
+ result = walletPrepaidMapper.insert(walletPrepaid);
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -282,7 +282,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
BeanUtils.copyProperties(prepaidAddDto, prepaidRecord);
|
|
BeanUtils.copyProperties(prepaidAddDto, prepaidRecord);
|
|
|
prepaidRecord.setOrderNo(payReq.getOrderNo());
|
|
prepaidRecord.setOrderNo(payReq.getOrderNo());
|
|
|
prepaidRecord.setData(JSONObject.toJSONString(pay.getData()));
|
|
prepaidRecord.setData(JSONObject.toJSONString(pay.getData()));
|
|
|
- walletPrepaidRecordMapper.insertWalletPrepaidRecord(prepaidRecord);
|
|
|
|
|
|
|
+ walletPrepaidRecordMapper.insert(prepaidRecord);
|
|
|
WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
|
|
WalletPayAddRes walletPayAddRes = new WalletPayAddRes();
|
|
|
PayRes data = pay.getData();
|
|
PayRes data = pay.getData();
|
|
|
walletPayAddRes.setId(prepaidRecord.getId());
|
|
walletPayAddRes.setId(prepaidRecord.getId());
|
|
@@ -383,13 +383,13 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
//修改预付记录
|
|
//修改预付记录
|
|
|
walletPrepaidRecord.setReceivedAmount(receivedCallbackDto.getTranAmt());
|
|
walletPrepaidRecord.setReceivedAmount(receivedCallbackDto.getTranAmt());
|
|
|
walletPrepaidRecord.setStatus(PayStatusEnum.PAID.getCode());
|
|
walletPrepaidRecord.setStatus(PayStatusEnum.PAID.getCode());
|
|
|
- walletPrepaidRecordMapper.updateWalletPrepaidRecord(walletPrepaidRecord);
|
|
|
|
|
|
|
+ walletPrepaidRecordMapper.updateById(walletPrepaidRecord);
|
|
|
//预付清单修改预付余额
|
|
//预付清单修改预付余额
|
|
|
walletPrepaid.setPreBalance(walletPrepaid.getPreBalance().add(walletPrepaidRecord.getReceivedAmount()));
|
|
walletPrepaid.setPreBalance(walletPrepaid.getPreBalance().add(walletPrepaidRecord.getReceivedAmount()));
|
|
|
- walletPrepaidMapper.updateWalletPrepaid(walletPrepaid);
|
|
|
|
|
|
|
+ walletPrepaidMapper.updateById(walletPrepaid);
|
|
|
//插入预付明细
|
|
//插入预付明细
|
|
|
WalletPrepaidBalance prepaidBalance = buildReceivedPrepaidBalance(walletPrepaid, walletPrepaidRecord);
|
|
WalletPrepaidBalance prepaidBalance = buildReceivedPrepaidBalance(walletPrepaid, walletPrepaidRecord);
|
|
|
- prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
|
|
|
|
|
|
|
+ prepaidBalanceMapper.insert(prepaidBalance);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -440,9 +440,9 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
throw new BusinessException("交易类型不支持");
|
|
throw new BusinessException("交易类型不支持");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- result = walletPrepaidMapper.updateWalletPrepaid(existedPrepaid);
|
|
|
|
|
|
|
+ result = walletPrepaidMapper.updateById(existedPrepaid);
|
|
|
WalletPrepaidBalance prepaidBalance = buildWalletUpdatePrepaidBalance(existedPrepaid, prepaidDto);
|
|
WalletPrepaidBalance prepaidBalance = buildWalletUpdatePrepaidBalance(existedPrepaid, prepaidDto);
|
|
|
- prepaidBalanceMapper.insertWalletPrepaidBalance(prepaidBalance);
|
|
|
|
|
|
|
+ prepaidBalanceMapper.insert(prepaidBalance);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -459,7 +459,7 @@ public class WalletPrepaidServiceImpl implements IWalletPrepaidService {
|
|
|
walletPrepaid.setSupEntId(prepaidDto.getSupEntId());
|
|
walletPrepaid.setSupEntId(prepaidDto.getSupEntId());
|
|
|
walletPrepaid.setPreBalance(BigDecimal.ZERO);
|
|
walletPrepaid.setPreBalance(BigDecimal.ZERO);
|
|
|
walletPrepaid.setTradingAmount(BigDecimal.ZERO);
|
|
walletPrepaid.setTradingAmount(BigDecimal.ZERO);
|
|
|
- result = walletPrepaidMapper.insertWalletPrepaid(walletPrepaid);
|
|
|
|
|
|
|
+ result = walletPrepaidMapper.insert(walletPrepaid);
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|