From f7a4d6041dd569973594eb7e6a6828a2651935ce Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 27 Mar 2023 18:38:47 +0800 Subject: [PATCH] fix business --- .../main/java/com/iformall/domain/po/WxScoreRules.java | 8 ++++---- .../iformall/service/impl/WxScoreRulesServiceImpl.java | 2 +- .../src/main/java/com/iformall/utils/Constant.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) 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 81827b10b..d89ba2cf9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -46,7 +46,7 @@ public class WxScoreRules extends BaseTenantEntity { "[" + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + "{\"id\":2,\"childs\":[" + - " {\"businessId\":"+Constant.default_business+",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" + + " {\"businessId\":"+Constant.default_business+",\"title\":\""+Constant.default_business_name+"\",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" + "]}," + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + @@ -58,7 +58,7 @@ public class WxScoreRules extends BaseTenantEntity { "[" + // "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + "{\"id\":2,\"childs\":[" + - " {\"businessId\":"+Constant.default_business+",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" + + " {\"businessId\":"+Constant.default_business+",\"title\":\""+Constant.default_business_name+"\",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" + "]}," + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + @@ -159,8 +159,8 @@ public class WxScoreRules extends BaseTenantEntity { return null; } - public static JSONObject createBusinessDefaultJson(Integer businessId) { - String json = "{\"businessId\":"+businessId+",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" ; + public static JSONObject createBusinessDefaultJson(Integer businessId,String businessNme) { + String json = "{\"businessId\":"+businessId+",\"title\":\""+businessNme+"\",\"limit\":"+DEFAULT_LIMIT+",\"step\":"+DEFAULT_STEP+",\"score\":"+DEFAULT_SCORE+" ,\"desc\":\"线上交易1元\"}" ; return JSONObject.parseObject(json); } 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 5b2a224ff..88202a703 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -137,7 +137,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { for (int i = 0 ; i < rootBusiness.size(); i++){ WxBusiness bu = rootBusiness.get(i); if (!businessRuleMap.containsKey(bu.getId())){ - businessRuleMap.put(bu.getId(), WxScoreRules.createBusinessDefaultJson(bu.getId())); + businessRuleMap.put(bu.getId(), WxScoreRules.createBusinessDefaultJson(bu.getId(),bu.getTitle())); } } } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index ba8b242dc..d39ca9b69 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -128,6 +128,7 @@ public class Constant { //默认业态 public static final Integer default_business = 6; + public static final String default_business_name = "其他"; public static final Integer dy_business = 2; }