yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PC款项确认申请修改

master
dimengzhe 2 years ago
parent
3fe144f9c2
commit
87db7a4813
1 changed files with 81 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 115
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

115
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -235,10 +235,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isBlank(sid)) {
//首次认款
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) {
// BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
/*if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) {
return rb.setMsg("认款不完全，提交失败");
}
}*/
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
if (paymentVoucherAppendixs.size() == 0) {
return rb.setMsg("请上传打款凭证附件");
@ -287,38 +288,42 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
});
String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
//认款明细保存
String finalSid = sid;
finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
finSelectedReceivablesDetailed.setCollSid(finalSid);
finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("001");
baseVehicleTempstateDto.setTempValue("车款");
}
if ("订金".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("002");
baseVehicleTempstateDto.setTempValue("订金");
}
if(finSelectedReceivablesDetailedDtos.size() > 0){
//认款明细保存
String finalSid = sid;
finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
finSelectedReceivablesDetailed.setCollSid(finalSid);
finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("001");
baseVehicleTempstateDto.setTempValue("车款");
}
if ("订金".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("002");
baseVehicleTempstateDto.setTempValue("订金");
}
baseVehicleTempstateDto.setBusSid(finalSid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
});
}
baseVehicleTempstateDto.setBusSid(finalSid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
});
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
finCollectionConfirmation.setAuditState(1);
//1未认款/2部分认款/3已认款
@ -327,6 +332,48 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} else {//认款、多次认款
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
if(finCollectionConfirmation == null){
return rb.setMsg("该申请不存在");
}
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
if(finSelectedReceivablesDetailedDtos.size() > 0){
//认款明细保存
String finalSid = sid;
finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
finSelectedReceivablesDetailed.setCollSid(finalSid);
finSelectedReceivablesDetailed.setUseOrgSid(finCollectionConfirmation.getUseOrgSid());
//设置审核状态为待审核(1待审核/2已驳回/3已审核)
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("001");
baseVehicleTempstateDto.setTempValue("车款");
}
if ("订金".equals(v.getReceivablesName())) {
baseVehicleTempstateDto.setTempKey("002");
baseVehicleTempstateDto.setTempValue("订金");
}
baseVehicleTempstateDto.setBusSid(finalSid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
});
}
finCollectionConfirmation.setAuditState(1);
baseMapper.updateById(finCollectionConfirmation);
}
/* FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();

Write Preview
Loading…
Cancel
Save