From 2334ffafb931b57f9ab3d30fe975d0dc2753f259 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Thu, 18 Apr 2019 16:13:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=AE=9A=E4=B9=89=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxCreditHistory.java | 2 +- .../src/main/java/com/iformall/enums/EnumScoreType.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 3407b4ba9..4cfe84068 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -52,7 +52,7 @@ public class WxCreditHistory implements Serializable { @io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum") private Integer creditNum; /**积分类型*/ - @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10增加积分,11积分兑换,12线下积分扣除 注:11积分兑换改为走订单接口",name="creditType") + @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10新增积分,11积分兑换,12消费积分 注:11积分兑换改为走订单接口",name="creditType") private Integer creditType; /**创建日期*/ @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index c5da16787..610660149 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -14,9 +14,9 @@ public enum EnumScoreType { COMPLETE_INFO(7, "完善个人信息"), MEM_IMPORT(8, "会员导入"), MEM_REDUCE(9, "会员成长值扣减"), - SPEND_CREDIT(10, "增加积分"), - REDUCE_CREDIT(12, "线下积分扣除"), - CHANGE_CREDIT(11, "积分兑换"); + SPEND_CREDIT(10, "新增积分"), + CHANGE_CREDIT(11, "积分兑换"), + REDUCE_CREDIT(12, "消费积分"); public static EnumScoreType getEnum(Integer code) { for (EnumScoreType value : values()) {