From f13d9bc03a3ffa9b8abcf84f0d3ddfdf96193c3e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Aug 2024 11:04:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088147=20=E8=B5=84=E6=96=99=E7=BD=91?=
 =?UTF-8?q?=E5=85=83-=E7=BC=96=E8=BE=91=E9=87=91=E9=A2=9D=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=B8=8B=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/service/impl/ProjectDetailServiceImpl.java   | 2 +-
 .../java/com/jero/meeting/entity/PayMeetingSituation.java    | 2 +-
 .../java/com/jero/meeting/vo/MeetingSituationContractVO.java | 2 +-
 .../java/com/jero/member/entity/PayMemberProjectSubitem.java | 5 +----
 .../jero/member/service/IPayMemberProjectSubitemService.java | 3 +++
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index 7acbb801..4b25a881 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -498,7 +498,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
                 projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
             }
             // 开票金额 > 0 && 开票金额 < 待确收金额 = 2
-            if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){
+            if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0){
                 projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
             }
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index e4b99893..3ff61d6a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -353,7 +353,7 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "到账")
     private Integer inAccount;
 
-	/**开票*/
+    /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
 	//@Excel(name = "开票", width = 15)
     @ApiModelProperty(value = "开票")
     private Integer makeInvoice;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
index 5e52455b..2a4dfd0a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
@@ -286,7 +286,7 @@ public class MeetingSituationContractVO {
     @ApiModelProperty(value = "到账")
     private Integer inAccount;
 
-    /**开票*/
+    /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
     @ApiModelProperty(value = "开票")
     private Integer makeInvoice;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index 6846005f..b84dd976 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -251,11 +251,8 @@ public class PayMemberProjectSubitem implements Serializable {
     @ApiModelProperty(value = "到账")
     private Integer inAccount;
 
-    /**
-     * 开票
-     */
+    /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
     @ApiModelProperty(value = "开票")
-    @Dict(dicCode = "yn")
     private Integer makeInvoice;
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
index 96d32ceb..496bc406 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
@@ -234,6 +234,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 			if(!Objects.isNull(projectStatusVO.getMail())){
 				payMemberProjectSubitem.setMail(projectStatusVO.getMail());
 			}
+			if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
+				payMemberProjectSubitem.setAffirmIncome(projectStatusVO.getAffirmIncome());
+			}
 		}
 		// 选择无
 		if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){