From a7e562f6ae0f5ead7a554f40ca314699686ffc52 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 7 Jan 2022 09:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/entity/PayPaymentRecordSub.java     |  6 ++++++
 .../impl/PayPaymentCheckServiceImpl.java        | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
index b9d3b10f..64497a66 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java
@@ -116,4 +116,10 @@ public class PayPaymentRecordSub implements Serializable {
 
     @ApiModelProperty(value = "来款记录表id")
     private String recordId;
+
+    /**
+     * 阶段
+     */
+    @TableField(exist = false)
+    private int stage;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index 80d14df0..d0e8b375 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -112,11 +112,20 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         wrapper.eq(PayPaymentRecordSub::getDelFlag, PayProjectCommon.NO);
         wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate);
         List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
-        list.forEach(p-> {
-            if(StringUtils.isNotBlank(p.getPaymentStatus())){
-                p.setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(p.getPaymentStatus())));
+
+        int stage=0;//阶段
+
+        for(int i=0;i<list.size();i++){
+            if(StringUtils.isNotBlank(list.get(i).getPaymentStatus())){
+                //缴费状态查字典表
+                list.get(i).setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(list.get(i).getPaymentStatus())));
+
+                if(PaymentStatusEnum.COMPLETED.getCode().equals(list.get(i).getPaymentStatus())){
+                    stage=stage+1;
+                    list.get(i).setStage(stage);
+                }
             }
-        });
+        }
 
         //实收、应收
         BigDecimal paidAmount=new BigDecimal("0");