From 744643c075b2ec09e3d04b25aa81ea84e8520e79 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Mon, 15 Apr 2019 18:55:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E8=B4=B9=E7=A7=AF=E5=88=86=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCreditHistory.java | 2 +- .../com/iformall/domain/vo/WxCouponChannelVo.java | 12 ++++++++++++ .../main/java/com/iformall/enums/EnumScoreType.java | 1 + .../service/impl/WxCreditHistoryServiceImpl.java | 9 ++++++++- 4 files changed, 22 insertions(+), 2 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 ac57606eb..9370ebf26 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积分兑换",name="creditType") + @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10增加积分,11积分兑换,12减少积分",name="creditType") private Integer creditType; /**创建日期*/ @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 347941a18..5bda75a9b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -82,6 +82,10 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") private Integer validDays; + /**积分售价(适用于类型10,11)**/ + @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") + private Integer creditPrice; + @Transient private String salePriceStr; @@ -301,4 +305,12 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setValidDays(Integer validDays) { this.validDays = validDays; } + + public Integer getCreditPrice() { + return creditPrice; + } + + public void setCreditPrice(Integer creditPrice) { + this.creditPrice = creditPrice; + } } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index 1ac256dce..48fd39a53 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -15,6 +15,7 @@ public enum EnumScoreType { MEM_IMPORT(8, "会员导入"), MEM_REDUCE(9, "会员成长值扣减"), SPEND_CREDIT(10, "增加积分"), + REDUCE_CREDIT(12, "减少积分"), 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 900578a0d..da65e4808 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -240,11 +240,18 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType() == EnumScoreType.CONSUMPTION.getCode()) { return payAddCredit(record); } - + if (record.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { + return reduceCredit(record); + } return 0; } + private int reduceCredit(WxCreditHistory record) { + int reduceCredit = record.getCreditNum(); + return -reduceCredit; + } + private int loginAddCredit(WxCreditHistory record) { //如果当天已经登录过则跳过 if (wxCreditHistoryMapper.loginCount(record) > 0) {