缴费审核

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
@@ -90,9 +91,12 @@ public class PayPaymentRecord implements Serializable {
      * 	COMPLETED("completed");//已同意
      */
     @ApiModelProperty(value = "缴费状态")
-    @Dict(dicCode = "payment_record_status")
+//    @Dict(dicCode = "payment_record_status")
     private String paymentStatus;
 
+    @TableField(exist = false)
+    private String paymentStatus_dictText;
+
     @ApiModelProperty(value = "审核人id")
     private String reviewerId;
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java

@@ -10,6 +10,7 @@ import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.contract.common.PayIncomeContractCommon;
@@ -72,6 +73,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
     private ISysUserService sysUserService;
     @Resource
     private SendMessageService sendMessageService;
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      *  来款列表
@@ -83,9 +86,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         wrapper.eq(PayPaymentRecord::getProjectId, id);
         wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
         List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
+        list.forEach(p-> {
+            if(StringUtils.isNotBlank(p.getPaymentStatus())){
+                p.setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(p.getPaymentStatus())));
+            }
+        });
 
         //实收、应收
-        BigDecimal paidAmount=new BigDecimal("0");;
+        BigDecimal paidAmount=new BigDecimal("0");
         BigDecimal receivableAmount=new BigDecimal("0");;
 
         switch (String.valueOf(projectType)){