|
|
|
@@ -120,24 +120,29 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
//当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 |
|
|
|
private String getScoreRulesNew(TenantEntity tenantEntity,String scoreRules,EnumScoreRules enumScoreRules){ |
|
|
|
JSONObject businessObject = WxScoreRules.getRuleObj(scoreRules, EnumScoreType.CONSUMPTION); |
|
|
|
Map<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>(); |
|
|
|
Map<Integer,JSONObject> currentBusinessRuleMap = new HashMap<Integer,JSONObject>(); |
|
|
|
if (null != businessObject) { |
|
|
|
JSONArray jsonArrayOld = businessObject.getJSONArray("childs"); |
|
|
|
if (null != jsonArrayOld && jsonArrayOld.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < jsonArrayOld.size(); i++) { |
|
|
|
JSONObject o = jsonArrayOld.getJSONObject(i); |
|
|
|
Integer bussinessId = o.getInteger("businessId"); |
|
|
|
businessRuleMap.put(bussinessId, o); |
|
|
|
currentBusinessRuleMap.put(bussinessId, o); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//根据业态来匹配 |
|
|
|
Map<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>(); |
|
|
|
List<WxBusiness> rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); |
|
|
|
if (null != rootBusiness && rootBusiness.size() > 0 ) { |
|
|
|
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(),bu.getTitle())); |
|
|
|
if (currentBusinessRuleMap.containsKey(bu.getId())) { |
|
|
|
businessRuleMap.put(bu.getId(),currentBusinessRuleMap.get(bu.getId())); |
|
|
|
}else { |
|
|
|
if (!businessRuleMap.containsKey(bu.getId())){ |
|
|
|
businessRuleMap.put(bu.getId(), WxScoreRules.createBusinessDefaultJson(bu.getId(),bu.getTitle())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|