From ea5c7a22ccb61a1fdd8c85858be26100f35bb754 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 24 Dec 2021 17:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPaymentRecordController.java           | 19 +++++++++++++++++++
 .../jero/payment/entity/PayPaymentRecord.java |  6 ++++++
 .../impl/PayPaymentRecordServiceImpl.java     | 10 +++++++---
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
index 364aec25..2fb2fad2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
@@ -28,7 +28,10 @@ import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.entity.TbCertificatePayment;
 import com.jero.member.entity.TbMemberProjectSubitem;
+import com.jero.member.service.ITbCertificatePaymentService;
+import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
@@ -59,6 +62,10 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 	private IPayPaymentRecordService payPaymentRecordService;
 	@Autowired
 	private IPayMailBillService payMailBillService;
+	 @Autowired
+	 private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
+	 @Autowired
+	 private ITbCertificatePaymentService tbCertificatePaymentService;
 
 	/**
 	 * 到账开票主列表
@@ -156,6 +163,18 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 		wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
 		List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
 
+		//标协会员、标协证书查出缴费方式
+		if(list!=null && list.size()>0){
+			if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(list.get(0).getProjectType()))){
+				TbMemberProjectSubitem memberProject = tbMemberProjectSubitemService.getById(id);
+				list.get(0).setPaymentMethod(memberProject.getPaymentMethod());
+			}
+			if(PayIncomeContractCommon.PROJECT_TYPE6.equals(String.valueOf(list.get(0).getProjectType()))){
+				TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(id);
+				list.get(0).setPaymentMethod(tbCertificatePayment.getPaymentMethod());
+			}
+		}
+
 		return Result.OK(list);
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
index 752e6d3e..b7052918 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
@@ -109,4 +109,10 @@ public class PayPaymentRecord implements Serializable {
 
     @ApiModelProperty(value = "审核说明")
     private String reviewInstructions;
+
+    /**缴费方式*/
+    @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
+    @Dict(dicCode = "meeting_pay_type")
+    @TableField(exist = false)
+    private Integer paymentMethod;
 }
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 81403838..c86490fc 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
@@ -163,6 +163,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 commonProject.setSituationId(id);
             }
             //插入待审核状态，供前端判断是否显示审核按钮
+            //先查审核记录表有没有待审核的
             for(PayPaymentRecordSub recordSub : RecordSubList){
                 if(commonProject.getId().equals(recordSub.getProjectId())){
                     if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(recordSub.getPaymentStatus())){
@@ -171,9 +172,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     }
                 }
             }
-//            if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
-//                commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
-//            }
+            //再查项目主表状态是不是待审核
+            if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
+                if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
+                    commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
+                }
+            }
             //会议、标协会员、标协证书，来款单位拼接“未审核”
             if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
                     commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||