From 1292b68d5ab74aaf99569f48775cdaa5aff84e2f Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 16 Dec 2021 11:53:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/enums/PaymentStatusEnum.java | 2 +- .../java/com/jero/payment/entity/PayPaymentRecord.java | 4 +++- .../com/jero/payment/entity/PayPaymentRecordSub.java | 9 +++++---- .../payment/service/impl/PayPaymentCheckServiceImpl.java | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/PaymentStatusEnum.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/PaymentStatusEnum.java index 9431d262..f98bbcd3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/PaymentStatusEnum.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/PaymentStatusEnum.java @@ -8,7 +8,7 @@ public enum PaymentStatusEnum { TO_BE_UPLOADED("toBeUploaded"),//待上传 TO_BE_REVIEWED("toBeReviewed"),//待审核 REJECTED("rejected"),//已拒绝 - COMPLETED("completed");//已完结 + COMPLETED("completed");//在外层项目列表代表已完结、在阶段记录列表代表已同意 private String code; 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 0e97534f..c52dfed3 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 @@ -6,6 +6,7 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -86,9 +87,10 @@ public class PayPaymentRecord implements Serializable { /** * TO_BE_REVIEWED("toBeReviewed"),//待审核 * REJECTED("rejected"),//已拒绝 - * COMPLETED("completed");//已完结 + * COMPLETED("completed");//已同意 */ @ApiModelProperty(value = "缴费状态") + @Dict(dicCode = "payment_record_status") private String paymentStatus; @ApiModelProperty(value = "审核人id") 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 e44df919..d792eb3a 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -82,12 +83,12 @@ public class PayPaymentRecordSub implements Serializable { private String applicantName; /** - * toBeUploaded 待上传 - * toBeReviewed 待审核 - * rejected 已拒绝 - * completed 已完结 + * TO_BE_REVIEWED("toBeReviewed"),//待审核 + * REJECTED("rejected"),//已拒绝 + * COMPLETED("completed");//已同意 */ @ApiModelProperty(value = "缴费状态") + @Dict(dicCode = "payment_record_status") private String paymentStatus; @ApiModelProperty(value = "审核人id") 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 d3badc99..77a8f137 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 @@ -157,6 +157,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl