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

款项申请确认驳回逻辑修改

master
dimengzhe 2 years ago
parent
79834ff485
commit
84c6131d68
2 changed files with 33 additions and 179 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. 208
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

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

@ -33,8 +33,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
@ -363,7 +361,6 @@ 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) {
return rb.setMsg("认款总额与收款金额不符");
@ -375,11 +372,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isBlank(v.getSubscriptionMoney())) {
return rb.setMsg("认款金额不允许为空");
}
if (new BigDecimal(v.getSubscriptionMoney()).compareTo(new BigDecimal(v.getCurrentReceivableMoney())) > 0) {
return rb.setMsg("认款金额不允许大于当前应收金额");
}
}
}
//对收款申请进行赋值操作
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
@ -395,7 +388,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String useOrgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
}
@ -449,7 +441,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
/* BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
@ -467,11 +459,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);*/
//应收未收减去相应的认款
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
});
}
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
finCollectionConfirmation.setAuditState(1);
//1未认款/2部分认款/3已认款
@ -479,10 +474,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//添加单据编号
String billNo = getApplyCode(finCollectionConfirmation.getUseOrgSid());
finCollectionConfirmation.setBillNo(billNo);
baseMapper.insert(finCollectionConfirmation);
} else {//认款、多次认款
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
if (finCollectionConfirmation == null) {
@ -510,7 +502,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
/* BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(v.getReceivablesName())) {
@ -528,134 +520,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);*/
//应收未收减去相应的认款
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
});
}
finCollectionConfirmation.setAuditState(1);
baseMapper.updateById(finCollectionConfirmation);
}
/* FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
if (paymentVoucherAppendixs.size() == 0) {
return rb.setMsg("请上传打款凭证附件");
}
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
if (remittanceConfirmationAppendixs.size() == 0) {
return rb.setMsg("请上传汇款确认书附件");
}
//款项申请主表sid
String sid = finCollectionConfirmation.getSid();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
// finCollectionConfirmation.setSid(sid1);
String payFilePath = "";
String remFilePath = "";
//用户sid
String createBySid = dto.getUserSid();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
finCollectionConfirmation.setCreateBySid(createBySid);
finCollectionConfirmation.setUseOrgSid(useOrgSid);
//附件进行保存
for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
String s = commonAppendixDto.getFilePath();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
payFilePath += s + ",";
}
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
for (FinCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
String s = commonAppendixDto.getFilePath();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += s + ",";
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) {
//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed);
//主表sid
finSelectedReceivablesDetailed.setCollSid(sid);
//设置审核状态为待审核
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
baseVehicleTempstateDto.setTempKey("1");
baseVehicleTempstateDto.setTempValue("待审核");
baseVehicleTempstateDto.setBusSid(sid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
//已选应收款项-车架号
String vin = finSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
if (subscriptionMoney == null) {
return rb.setMsg("请输入认款金额");
}
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("认款金额超出应收金额，请重新输入");
}
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
}
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
BigDecimal totalSubscriptionMone = new BigDecimal(0);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney);
}
//收款金额
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
}
finCollectionConfirmation.setBalance(collectionMoney);
FinCollectionConfirmation confirmation = fetchBySid(dto.getSid());
if (confirmation == null) {
finCollectionConfirmation.setBalance(collectionMoney);
} else {
finCollectionConfirmation.setBalance(confirmation.getBalance());
}
finCollectionConfirmation.setAuditState(1);
finCollectionConfirmation.setPaymentState(1);
save(finCollectionConfirmation);*/
return rb.success().setMsg("添加成功");
}
@ -1133,7 +1008,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid());
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
/* BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
if ("车款".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
@ -1151,7 +1026,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);*/
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
return rb.success();
}
@ -1200,7 +1079,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.notIn("sid", params.getSidList());
}
qw.gt("currentReceivableMoney", 0);//应收金额
ResultBean<List<BaseVehicleTempstate>> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
/*ResultBean<List<BaseVehicleTempstate>> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
List<BaseVehicleTempstate> baseVehicleTempstates = baseVehicleTempstateFeignList.getData();
if (baseVehicleTempstates.size() > 0) {
List<String> stringList = baseVehicleTempstates.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList());
@ -1213,14 +1092,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.notIn("sid", strings);
}
}
}
}*/
if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
} else {
qw.eq("purchaseSystemSid", "0");
}
//筛选
ResultBean<List<BaseVehicleTempstate>> resultBeanNew = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
/* ResultBean<List<BaseVehicleTempstate>> resultBeanNew = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
List<BaseVehicleTempstate> list = resultBeanNew.getData();
if (list.size() > 0) {
List<String> stringList = list.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList());
@ -1233,8 +1112,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.notIn("sid", strings);
}
}
}
// IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
}*/
List<AppFinUncollectedReceivablesDetailedVo> collList = finSelectedReceivablesDetailedService.getPaymentList(qw, params.getName());
if (collList.isEmpty()) {
collList = finSelectedReceivablesDetailedService.getPaymentList(qw, "");
@ -1331,6 +1209,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailed.setAuditState(2);
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
//应收未收将款项加回来
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
});
confirmation.setAuditState(2);
//更新驳回原因
@ -1344,30 +1227,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseMapper.updateById(confirmation);
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
/*baseMapper.cashierReject(sid);
int auditState = 1;
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
//更新审核时间
finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2");
String vin = finSelectedReceivablesDetailedVo.getVIN();
String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
String sid1 = finUncollectedReceivablesDetailedVo.getSid();
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);
}
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
finCollectionConfirmation.setBalance(collectionMoney);
FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto();
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDto);
updateBySid(finCollectionConfirmationDto, finCollectionConfirmationDto.getSid());
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/
return rb.success().setMsg("驳回成功");
}
@ -1818,7 +1677,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
log.info("收款单推送：" + resultBean2.getMsg());
}
//===========================================
//查询该申请下的所有待审核的款项明细
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
@ -1830,9 +1688,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//应收未收款项明细sid
String receivablesSid = v.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
/*BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
//更新当前应收金额
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney.subtract(new BigDecimal(v.getSubscriptionMoney())));
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney.subtract(new BigDecimal(v.getSubscriptionMoney())));*/
//更新认款状态
finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
@ -1888,10 +1746,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}
}
}
}
@ -1899,7 +1754,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
//查询该申请所有的款项明细
finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
//与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -109,7 +109,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
}
}
}
ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
/*ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
List<BaseVehicleTempstate> list = resultBean.getData();
if (list.size() > 0) {
List<String> stringList = list.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList());
@ -122,7 +122,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
qw.notIn("sid", strings);
}
}
}
}*/
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("contractNo", query.getContractNo());
}

Write Preview
Loading…
Cancel
Save