|
|
|
@@ -113,9 +113,18 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
//当成长值或积分规则新增时,将新增的数据一并返回给接口调用端 |
|
|
|
private String getScoreRulesNew(String scoreRules,EnumScoreRules enumScoreRules){ |
|
|
|
//getJSONObject(1) 为EnumScoreType.CONSUMPTION(2, "消费")的下标值 |
|
|
|
JSONArray jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(1).getJSONArray("childs"); |
|
|
|
String defaultRules = enumScoreRules.equals(EnumScoreRules.SCORE) ? WxScoreRules.getScoreDefaultRules() : WxScoreRules.getCreditDefaultRules(); |
|
|
|
JSONArray jsonArrayDefault = JSONArray.parseArray(defaultRules).getJSONObject(1).getJSONArray("childs"); |
|
|
|
JSONArray jsonArrayOld = new JSONArray(); |
|
|
|
JSONArray jsonArrayDefault = new JSONArray(); |
|
|
|
if(enumScoreRules.equals(EnumScoreRules.SCORE)){ |
|
|
|
jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(1).getJSONArray("childs"); |
|
|
|
String defaultRules = WxScoreRules.getScoreDefaultRules(); |
|
|
|
jsonArrayDefault = JSONArray.parseArray(defaultRules).getJSONObject(1).getJSONArray("childs"); |
|
|
|
}else if(enumScoreRules.equals(EnumScoreRules.CREDIT)){ |
|
|
|
jsonArrayOld = JSONArray.parseArray(scoreRules).getJSONObject(0).getJSONArray("childs"); |
|
|
|
String defaultRules = WxScoreRules.getCreditDefaultRules(); |
|
|
|
jsonArrayDefault = JSONArray.parseArray(defaultRules).getJSONObject(0).getJSONArray("childs"); |
|
|
|
} |
|
|
|
|
|
|
|
if (jsonArrayOld.size() < jsonArrayDefault.size()) { |
|
|
|
JSONArray childsJsonArray = new JSONArray(); |
|
|
|
JSONObject otherJSONObject = new JSONObject(); |
|
|
|
|