From 1c1f3c524b5f987ca3933785ded653cf7a29d38d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 16:18:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083172=20=E7=94=B3=E8=AF=B7=E5=85=A5?=
 =?UTF-8?q?=E4=BC=9A=E5=90=8E--=E9=A2=84=E4=BC=B0=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=A6=81=E9=BB=98=E8=AE=A4=E5=BD=93=E5=A4=A9?=
 =?UTF-8?q?=EF=BC=8C=E7=A8=8E=E7=8E=87=E9=BB=98=E8=AE=A46%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ITbMemberProjectSubitemService.java       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index c577f150..2798028e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -138,7 +138,8 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 		if (count > 0) {
 			throw new JeroBootException("会员单位已经存在");
 		}
-		if (Objects.isNull(tbMemberProjectSubitem.getAmountReceivable())) {
+		BigDecimal amountReceivable = tbMemberProjectSubitem.getAmountReceivable();
+		if (Objects.isNull(amountReceivable)) {
 			throw new JeroBootException("待确收金额不能为空");
 		}
 		if (Objects.equals(tbMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY2)) {
@@ -151,7 +152,21 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 				throw new JeroBootException("收费通知号不能为空");
 			}
 		}
-		
+		//预估到账日期
+		Date estimatedArrivalDate = tbMemberProjectSubitem.getEstimatedArrivalDate();
+		if (estimatedArrivalDate == null){
+			tbMemberProjectSubitem.setEstimatedArrivalDate(DateUtil.date());
+		}
+
+		BigDecimal taxRate = tbMemberProjectSubitem.getTaxRate();
+		if (taxRate == null){
+			tbMemberProjectSubitem.setTaxRate(StaticConfig.TAX_RATE);
+			BigDecimal noTaxAmount = amountReceivable.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
+			BigDecimal tax = amountReceivable.subtract(noTaxAmount);
+			tbMemberProjectSubitem.setNoTaxAmount(noTaxAmount);
+			tbMemberProjectSubitem.setTax(tax);
+		}
+
 		//赋值会员编号
 		TbMemberProjectSubitem takeEffectInfo = getTakeEffectInfo(companyId);
 		if (takeEffectInfo!=null){