From 5950d4412aee497f0ad0c0f01bcf90da6c8f714e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Oct 2018 11:01:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E8=B4=B9=E7=94=A8=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxBillDaily.java | 2 +- .../main/java/com/iformall/enums/EnumBillDailyStatus.java | 7 ++++--- .../src/main/resources/mapper/WxBillDailyMapper.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 2b1b52ecb..2eca92e8d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -76,7 +76,7 @@ public class WxBillDaily implements Serializable { @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Integer owe; /*账单状态1待缴2欠缴3已结清**/ - @io.swagger.annotations.ApiModelProperty(value="账单状态1待缴2欠缴3已结清",name="status") + @io.swagger.annotations.ApiModelProperty(value="账单状态1未到期2待缴3欠缴4已结清",name="status") private Integer status; /*删除 是1否0**/ @io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java index e22745b9c..37b462393 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java @@ -7,9 +7,10 @@ package com.iformall.enums; public enum EnumBillDailyStatus { - WAIT_PAY(1,"待缴"), - NOT_PAID(2, "欠缴"), - PAID(3, "已结清"), + NOT_EXPIRED(1,"未到期"), + WAIT_PAY(2,"待缴"), + NOT_PAID(3, "欠缴"), + PAID(4, "已结清"), ; public static EnumBillDailyStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 332f6e35a..c7d68cd0e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -57,7 +57,7 @@