From 82c0b807d4729e28017aeac7b7690268a99b5eb8 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 8 Dec 2022 11:35:42 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E7=AE=A1=E7=90=86=E5=91=98=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=A0=87=E8=AF=86=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/22年12月变更.sql                           |  6 +-
 .../member/entity/TbCertificatePayment.java   |  5 ++
 .../member/entity/TbMemberProjectSubitem.java |  5 ++
 .../impl/PayPaymentRecordServiceImpl.java     | 82 +++++++++++--------
 4 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/db/22年12月变更.sql b/db/22年12月变更.sql
index 2759348e..35a40580 100644
--- a/db/22年12月变更.sql
+++ b/db/22年12月变更.sql
@@ -3,4 +3,8 @@ ALTER TABLE `tb_certificate_payment`
     ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
 ALTER TABLE `tb_member_project_subitem`
     ADD COLUMN `post_company_id` varchar(100) NULL COMMENT '邮寄企业id',
-    ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
\ No newline at end of file
+    ADD COLUMN `post_contact_id` varchar(100) NULL COMMENT '邮寄联系人id';
+ALTER TABLE `tb_certificate_payment`
+    ADD COLUMN `admin_add_flag` tinyint(1) default 0 COMMENT '管理员创建标识';
+ALTER TABLE `tb_member_project_subitem`
+    ADD COLUMN `admin_add_flag` tinyint(1) default 0 COMMENT '管理员创建标识';
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
index 67813299..0d7c9fec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
@@ -360,4 +360,9 @@ public class TbCertificatePayment implements Serializable {
 
     @ApiModelProperty(value = "邮寄联系人id")
     private String postContactId;
+    /**
+     * 管理员创建标识
+     */
+    @ApiModelProperty(value = "管理员创建标识")
+    private Integer adminAddFlag;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index 220bcda6..46e7f128 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -333,4 +333,9 @@ public class TbMemberProjectSubitem implements Serializable {
 
     @ApiModelProperty(value = "邮寄联系人id")
     private String postContactId;
+    /**
+     * 管理员创建标识
+     */
+    @ApiModelProperty(value = "管理员创建标识")
+    private Integer adminAddFlag;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 99e2b850..3f85f98e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -653,7 +653,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             tbMember.setConfirmTax(tax);
             tbMember.setConfirmNoTaxAmount(noTaxAmount);
         }else {
-            tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
+            if (tbMember.getAdminAddFlag() == 1) {
+                tbMember.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+            }else {
+                tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
+            }
         }
         tbMemberProjectSubitemMapper.updateById(tbMember);
         return Result.OK("添加成功！");
@@ -683,44 +687,50 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             certificatePayment.setInAccount(inAccount);
             certificatePayment.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+
+            //税额
+            BigDecimal noTaxAmount;
+            BigDecimal tax;
+            //税额赋值
+            BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
+            if (certificatePayment.getInvoiceRequirements() == 0) {
+                noTaxAmount = amountReceived;
+                tax = BigDecimal.ZERO;
+            }else {
+                noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
+                tax = amountReceived.subtract(noTaxAmount);
+            }
+            //保存税额
+            certificatePayment.setConfirmTax(tax);
+            certificatePayment.setConfirmNoTaxAmount(noTaxAmount);
+
+            //插入来款记录表
+            LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+            if (sysUser!=null) {
+                payPaymentRecord.setReviewerId(sysUser.getId());
+                payPaymentRecord.setReviewerName(sysUser.getRealname());
+            }else {
+                payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
+                payPaymentRecord.setReviewerName("标协管理员");
+            }
+            payPaymentRecord.setReviewTime(new Date());
+            payPaymentRecord.setProjectId(certificatePayment.getId());
+            payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));
+
+            payPaymentRecord.setTax(tax);
+            payPaymentRecord.setNoTaxAmount(noTaxAmount);
+
+            payPaymentRecordMapper.insert(payPaymentRecord);
         }else {
-            certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
-            payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
+            if (certificatePayment.getAdminAddFlag() == 1) {
+                certificatePayment.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+                payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+            }else {
+                certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
+                payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
+            }
         }
-        //税额
-        BigDecimal noTaxAmount;
-        BigDecimal tax;
-        //税额赋值
-        BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
-        if (certificatePayment.getInvoiceRequirements() == 0) {
-            noTaxAmount = amountReceived;
-            tax = BigDecimal.ZERO;
-        }else {
-            noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
-            tax = amountReceived.subtract(noTaxAmount);
-        }
-        //保存税额
-        certificatePayment.setConfirmTax(tax);
-        certificatePayment.setConfirmNoTaxAmount(noTaxAmount);
         certificatePaymentMapper.updateById(certificatePayment);
-
-        //插入来款记录表
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        if (sysUser!=null) {
-            payPaymentRecord.setReviewerId(sysUser.getId());
-            payPaymentRecord.setReviewerName(sysUser.getRealname());
-        }else {
-            payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
-            payPaymentRecord.setReviewerName("标协管理员");
-        }
-        payPaymentRecord.setReviewTime(new Date());
-        payPaymentRecord.setProjectId(certificatePayment.getId());
-        payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));
-
-        payPaymentRecord.setTax(tax);
-        payPaymentRecord.setNoTaxAmount(noTaxAmount);
-
-        payPaymentRecordMapper.insert(payPaymentRecord);
         return Result.OK("添加成功！");
     }