From 97ca763f79f1c181fd8c46a974b9d0942954787e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 27 Dec 2022 10:33:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=B0=86=E4=B8=80=E4=BA=9B=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/common/PayProjectCommon.java    |  8 ++++++++
 .../service/impl/PayWorkingGroupServiceImpl.java     | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
index 82010c5b..93ee272a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java
@@ -104,6 +104,10 @@ public class PayProjectCommon {
      * 项目类型1:工作组，2：分标委, 3:理事会
      */
     public final static Integer PROJECT_TYPE_FILE3 = 3;
+    /**
+     * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要））
+     */
+    public final static Integer NEED_INVOICE0 = 0;
     /**
      * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要））
      */
@@ -128,4 +132,8 @@ public class PayProjectCommon {
      * 	completed 已完结
      */
     public final static String PAYMENT_STATUS = "toBeUploaded";
+    /**
+     * 确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
+     */
+    public static Integer AFFIRM_INCOME0 = 0;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index b009b5e8..156e50c7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -281,6 +281,18 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
                 p.setInAccount(PayProjectCommon.IN_ACCOUNT0);
                 p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
                 p.setMail(PayProjectCommon.MAIL0);
+                p.setNeedInvoice(PayProjectCommon.NEED_INVOICE0);
+                p.setAffirmIncome(PayProjectCommon.AFFIRM_INCOME0);
+                p.setChargeNoticeNo(null);
+                p.setConfirmAmount(BigDecimal.ZERO);
+                p.setConfirmTax(BigDecimal.ZERO);
+                p.setConfirmNoTaxAmount(BigDecimal.ZERO);
+                p.setPaidAmount(BigDecimal.ZERO);
+                p.setPaidTax(BigDecimal.ZERO);
+                p.setPaidNoTaxAmount(BigDecimal.ZERO);
+                p.setInvoiceAmount(BigDecimal.ZERO);
+                p.setInvoiceTax(BigDecimal.ZERO);
+                p.setInvoiceNoTaxAmount(BigDecimal.ZERO);
                 p.setId(null);
                 p.setCreateBy(null);
                 p.setCreateTime(null);