From 18006623989128487e93e74011240bb271223bae Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Wed, 15 Dec 2021 20:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     |  2 --
 .../jero/project/entity/PayCommonProject.java |  1 +
 .../entity/PayWorkingGroupSubItem.java        |  1 +
 .../mapper/xml/PayCommonProjectMapper.xml     | 34 +------------------
 .../impl/PayCommonProjectServiceImpl.java     | 10 ++++++
 .../PayWorkingGroupSubItemServiceImpl.java    |  7 ++++
 6 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index f53de0cd..bedba1e2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -5,10 +5,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.dto.SendMessageDTO;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
index e41c0ed0..228ec72f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
@@ -180,6 +180,7 @@ public class PayCommonProject implements Serializable {
     private BigDecimal invoiceAmount;
 
     @ApiModelProperty(value = "缴费状态")
+    @Dict(dicCode = "payment_status")
     private String paymentStatus;
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
index 65a3140a..db4fb874 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
@@ -207,6 +207,7 @@ public class PayWorkingGroupSubItem implements Serializable {
     private BigDecimal invoiceAmount;
 
     @ApiModelProperty(value = "缴费状态")
+    @Dict(dicCode = "payment_status")
     private String paymentStatus;
 
     /**项目ids 多个以逗号分隔*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
index 9f6c8322..a0ca382b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
@@ -4,39 +4,7 @@
 
     <select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
         SELECT
-            pcp.id,
-            pcp.charge_project AS chargeProject,
-            pcp.year,
-            pcp.principal_id AS principalId,
-            pcp.principal_name AS principalName,
-            pcp.charge_company_id AS chargeCompanyId,
-            pcp.charge_company_temporary_id AS chargeCompanyTemporaryId,
-            pcp.charge_company_temporary_name AS chargeCompanyTemporaryName,
-            pcp.charge_use AS chargeUse,
-            pcp.contacts_id AS contactsId,
-            pcp.contacts_temporary_id AS contactsTemporaryId,
-            pcp.contacts_temporary_name AS contactsTemporaryName,
-            pcp.receivable_amount AS receivableAmount,
-            pcp.paid_amount AS paidAmount,
-            pcp.mail_contacts_temporary_id AS mailContactsTemporaryId,
-            pcp.mail_contacts_id AS mailContactsId,
-            pcp.mail_contacts_temporary_name AS mailContactsTemporaryName,
-            pcp.pack,
-            pcp.files,
-            pcp.need_invoice AS needInvoice,
-            pcp.in_account AS inAccount,
-            pcp.make_invoice AS makeInvoice,
-            pcp.mail,
-            pcp.charge_way AS chargeWay,
-            pcp.contract_num AS contractNum,
-            pcp.charge_notice_no AS chargeNoticeNo,
-            pcp.charge_notice_id AS chargeNoticeId,
-            pcp.press_money_times AS pressMoneyTimes,
-            pcp.remarks,
-            pcp.create_by AS createBy,
-            pcp.create_time AS createTime,
-            pcp.update_by AS updateBy,
-            pcp.update_time AS updateTime
+            pcp.*
         FROM pay_common_project pcp
 		LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id
 		<where>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index ca452000..78a03f9d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.PaySendContactsMessageDTO;
+import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.ProjectDetailService;
@@ -23,6 +24,7 @@ import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
+import com.jero.payment.service.IPayPaymentCheckService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
@@ -76,6 +78,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
     private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
     @Resource
     private RolePermissionService rolePermissionService;
+    @Resource
+    private IPayPaymentCheckService payPaymentCheckService;
 
 
 
@@ -106,6 +110,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
         payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
         payCommonProject.setMail(PayProjectCommon.MAIL0);
         payCommonProject.setPack(PayProjectCommon.PACKAGING0);
+        if(payCommonProject.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+            payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+        }
         payCommonProjectService.save(payCommonProject);
 
         // 来款方式为合同，校验合同编号
@@ -220,7 +227,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
                 payCommonProject.setMail(projectStatusVO.getMail());
             }
         }
+        String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus());
+        payCommonProject.setPaymentStatus(paymentStatus);
         payCommonProjectService.updateById(payCommonProject);
+
         LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
         updatePayCommonProject.eq(PayCommonProject::getId,payCommonProject.getId());
         // 选择无
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index cfe9c15d..a411ffae 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -27,6 +27,7 @@ import com.jero.meeting.entity.PayMeetingRemindRecord;
 import com.jero.meeting.service.IPayMeetingRemindRecordService;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
+import com.jero.payment.service.IPayPaymentCheckService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.*;
 import com.jero.project.service.IPayWorkingGroupService;
@@ -93,6 +94,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
     private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
     @Resource
     private RolePermissionService rolePermissionService;
+    @Resource
+    private IPayPaymentCheckService payPaymentCheckService;
 
 
     @Override
@@ -339,6 +342,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
             }
         }
+        String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(),payWorkingGroupSubItemOld.getPaidAmount(),payWorkingGroupSubItemOld.getPaymentStatus());
+        payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
         payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
         LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
         updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,payWorkingGroupSubItem.getId());
@@ -731,6 +736,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                         updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getMail,projectStatusVO.getMail());
                     }
                 }
+                String paymentStatus = payPaymentCheckService.getPaymentStatus(input.getReceivableAmount(),p.getPaidAmount(),p.getPaymentStatus());
+                updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPaymentStatus,paymentStatus);
                 updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getId());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,input.getCharge());
                 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,input.getReceivableAmount());