From 6b1b0d4f9dee1ec47f0664d4a6f51bdadd85fa99 Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 10 Apr 2019 19:26:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=202.=E5=88=B8=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0types=E5=AD=97=E6=AE=B5=E6=8F=90=E4=BE=9B=E5=88=B8?= =?UTF-8?q?=E7=BB=84=E5=90=88=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCoupon.java | 15 +++++++-- .../com/iformall/domain/po/WxScoreRules.java | 33 ++++++++++++++++--- .../service/impl/WxScoreRulesServiceImpl.java | 13 ++++---- .../main/resources/mapper/WxCouponMapper.xml | 9 ++++- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index d86041946..e2df39f3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -21,6 +21,9 @@ public class WxCoupon implements Serializable { @Transient protected List ids; + @Transient + protected List types; + @Transient protected List notinTypes; @Transient @@ -49,6 +52,14 @@ public class WxCoupon implements Serializable { this.ids = ids; } + public List getTypes() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + @Transient private String salePriceStr; @@ -70,8 +81,8 @@ public class WxCoupon implements Serializable { /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ - @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51积分停车券,100.消费卡)",name="type") + /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") private Integer type; /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 3cad5f49b..f389840d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -27,10 +27,9 @@ public class WxScoreRules implements Serializable { private static final long serialVersionUID = 1L; @Transient - private static final String defaultRules = + private static final String scoreDefaultRules = "[" + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":10 ,\"desc\":\"每日登陆\"}," + - // "{\"id\":2,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + "{\"id\":2,\"childs\":[" + " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + @@ -50,6 +49,29 @@ public class WxScoreRules implements Serializable { "{\"id\":7,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"编辑个人信息\"}" + "]"; + @Transient + private static final String creditDefaultRules = + "[" + + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + + "{\"id\":2,\"childs\":[" + + " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":3,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":5,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":7,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":8,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":9,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":10,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}" + + "]}," + + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + + "{\"id\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"连接WIFI1次\"}," + + "{\"id\":5,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权个人信息\"}," + + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + + "{\"id\":7,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + + "]"; + @Transient public static final String ID = "id"; @Transient @@ -114,9 +136,12 @@ public class WxScoreRules implements Serializable { tenantId = _tenantId; } + public static String getScoreDefaultRules() { + return scoreDefaultRules; + } - public static String getDefaultRules() { - return defaultRules; + public static String getCreditDefaultRules() { + return creditDefaultRules; } public void setRules(String rules) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 26e75999e..4e02b9396 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -64,13 +64,13 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); - scoreRules.setRules(getScoreRulesNew(scoreRules.getRules())); + scoreRules.setRules(getScoreRulesNew(scoreRules.getRules(),EnumScoreRules.SCORE)); } else { // 如果成长值规则不存在,启用默认值 final IdWorker idWorker = IdWorker.get(); scoreRules.setId(idWorker.nextId()); - scoreRules.setRules(WxScoreRules.getDefaultRules()); + scoreRules.setRules(WxScoreRules.getScoreDefaultRules()); wxScoreRulesMapper.insertSelective(scoreRules); } @@ -82,10 +82,11 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } //当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 - private String getScoreRulesNew(String scoreRules){ + private String getScoreRulesNew(String scoreRules,EnumScoreRules enumScoreRules){ //getJSONObject(1) 为EnumScoreType.CONSUMPTION(2, "消费")的下标值 JSONArray jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(1).getJSONArray("childs"); - JSONArray jsonArrayDefault = JSONArray.parseArray(WxScoreRules.getDefaultRules()).getJSONObject(1).getJSONArray("childs"); + String defaultRules = enumScoreRules.equals(EnumScoreRules.SCORE) ? WxScoreRules.getScoreDefaultRules() : WxScoreRules.getCreditDefaultRules(); + JSONArray jsonArrayDefault = JSONArray.parseArray(defaultRules).getJSONObject(1).getJSONArray("childs"); if (jsonArrayOld.size() < jsonArrayDefault.size()) { JSONArray childsJsonArray = new JSONArray(); JSONObject otherJSONObject = new JSONObject(); @@ -138,12 +139,12 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { scoreRules = list.get(0); - scoreRules.setRules(getScoreRulesNew(scoreRules.getRules())); + scoreRules.setRules(getScoreRulesNew(scoreRules.getRules(),EnumScoreRules.CREDIT)); } else { // 如果积分规则不存在,启用默认值 final IdWorker idWorker = IdWorker.get(); scoreRules.setId(idWorker.nextId()); - scoreRules.setRules(WxScoreRules.getDefaultRules()); + scoreRules.setRules(WxScoreRules.getCreditDefaultRules()); wxScoreRulesMapper.insertSelective(scoreRules); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4f51a0539..9d21962e4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -266,7 +266,7 @@ and c.`tenant_id` = #{tenantId} - + and c.`type` < 7 @@ -393,6 +393,13 @@ #{idItem} + + + and c.type in + + #{typesItem} + + order by ${sortColumns}