加阶段

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;
 }

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())){
+        int stage=0;//阶段
-                p.setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(p.getPaymentStatus())));
+
+        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");