From cf980ef06542e1d9bb1b42c24c6042e90159928d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 31 May 2019 00:32:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../main/java/com/iformall/domain/vo/WxBillDailyVo.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 9b1f50afb..b57641faf 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -296,7 +296,7 @@ public enum ErrorCode{ /** * 会员 */ - MEM_IMPORT_ERR(13000, "模板导入失败,请检查数据,尝试重新导入"), + MEM_IMPORT_ERR(13000, "数据导入失败,请检查数据,尝试重新导入"), MEM_SCORE_NOT_ENOUGH(13001, "成长值不够扣减值"), CREDIT_ZERO(13100,"本次操作积分为零"), CREDIT_NOT_ENOUGH(13101, "积分不够扣减值"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java index ed076c65b..27e043255 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; /** @@ -22,13 +23,15 @@ public class WxBillDailyVo extends WxBillDaily { @io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber") private String shopNumber; - @Excel(name = "实际应收金额(元)*", orderNum = "3", width = 20, numFormat = "#.##") + @Excel(name = "实际应收金额(元)*", orderNum = "3", width = 20, numFormat = "#.##", type = 10) @NotNull + @Digits(integer = 10, fraction = 2) @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePayStr") private String receivePayStr; - @Excel(name = "实收金额(元)*", orderNum = "4", width = 20, numFormat = "#.##") + @Excel(name = "实收金额(元)*", orderNum = "4", width = 20, numFormat = "#.##", type = 10) @NotNull + @Digits(integer = 10, fraction = 2) @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr") private String payStr;