diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 669ad1209e..25e42e4104 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -45,9 +45,11 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -123,6 +125,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinFundsCarriedForwardApplyQuery query = pq.getParams(); @@ -506,8 +510,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos(); Long rkje = yxysFinFundsCarriedForwardYXYSKXVos.stream().collect(Collectors.summingLong(AppFinFundsCarriedForwardYXYSKXDto::getConfirmMoney)); - if (rkje < jzjehj) { - return rb.setMsg("认款金额不能小于填写的结转金额"); + if (rkje != jzjehj) { + return rb.setMsg("认款金额与结转金额不符"); } if ("已认款".equals(dto.getSource())) { Boolean isOneSale = true; @@ -530,6 +534,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } //极光推送 finFundsCarriedForwardApply = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -770,6 +797,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } } @@ -800,6 +837,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); updateYeBySid(query.getBusinessSid()); + FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -812,6 +859,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); updateYeBySid(query.getBusinessSid()); + FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData(); + List yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos(); + if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){ + for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) { + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid()); + BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney())); + finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); + finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); + } + } return rb.success().setData(resultBean.getData()); } }