From f64e41dac6eca5d725f4aabf280228d860172504 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Fri, 12 Apr 2019 11:37:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=A7=AF=E5=88=86=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCreditHistory.java | 2 +- .../src/main/java/com/iformall/enums/EnumScoreType.java | 2 +- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 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 06023f246..a587ff734 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -51,7 +51,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积分兑换",name="creditType") + @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10增加积分,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 8a835cfab..1ac256dce 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -14,7 +14,7 @@ public enum EnumScoreType { COMPLETE_INFO(7, "完善个人信息"), MEM_IMPORT(8, "会员导入"), MEM_REDUCE(9, "会员成长值扣减"), - SPEND_CREDIT(10, "消费积分"), + SPEND_CREDIT(10, "增加积分"), CHANGE_CREDIT(11, "积分兑换"); public static EnumScoreType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 13ddcc238..b8fb4a83d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -293,7 +293,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private int spendCredit(WxCreditHistory record){ int spendCredit = record.getCreditNum(); - return -spendCredit; + return spendCredit; } private int changeCredit(WxCreditHistory record){