From 4b04b8bde50122fead632db1b0af9634e2a793e9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 15 Apr 2022 10:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=AF=B9=E9=87=91=E9=A2=9D=E7=9A=84?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusCollectionConfirmationService.java | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index d67eba51b8..a7c992052d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -38,7 +38,10 @@ import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; +import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; +import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService; +import com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -53,6 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.List; /** @@ -74,6 +78,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1); + BigDecimal totalSubscriptionMone = null; + for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { + BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); + totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); + } + BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney(); + BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); + if (subtract.compareTo(BigDecimal.ZERO) < 0){ + return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额,请重新核对"); + } + busCollectionConfirmation.setBalance(totalSubscriptionMone); + save(busCollectionConfirmation); return rb.success().setMsg("添加成功"); } updateBySid(dto, sid);