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 5bc350362..dc72faffb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -186,7 +186,8 @@ public class WxScoreRules extends BaseTenantEntity { } public static JSONObject replaceBusinessName(JSONObject json,String businessName) { - json.replace("title", businessName); + json.put("title",businessName); +// json.replace("title", businessName); return json; } 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 528d864af..1d1bc5b72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -777,13 +777,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override public void oldAddCreditWithNewConsume(TenantEntity tenantEntity, WxCreditHistory wxCreditHistory, WxCUserBasicInfo basicInfo,EnumAppPlat plat) { if(!EnumScoreType.SPEND_CREDIT.getCode().equals(wxCreditHistory.getCreditType()) - || !EnumScoreType.CONSUMPTION.getCode().equals(wxCreditHistory.getCreditType())){ + && !EnumScoreType.CONSUMPTION.getCode().equals(wxCreditHistory.getCreditType())){ return; } try{ WxCUserBasicInfo oldBasicInfo = wxCUserFromService.selectOldByNew(tenantEntity, wxCreditHistory.getCUserId(), plat); if(basicInfo == null){ + logger.info("推广会员消费加积分未找到用户"); return; } WxCreditHistory oldAddCredit = new WxCreditHistory(); @@ -800,7 +801,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { }catch(Exception e){ - + logger.error("推广会员消费加积分错误"+e.getMessage()); } } 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 8fa23dbc6..22aa3c566 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -144,7 +144,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } } } - logger.info("mysql >> data"+JSONObject.toJSONString(currentBusinessRuleMap)); +// logger.info("mysql >> data"+JSONObject.toJSONString(currentBusinessRuleMap)); //根据业态来匹配 Map businessRuleMap = new HashMap(); List rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); @@ -152,7 +152,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { for (int i = 0 ; i < rootBusiness.size(); i++){ WxBusiness bu = rootBusiness.get(i); if (currentBusinessRuleMap.containsKey(bu.getId())) { - logger.info("-- >> bu"+JSONObject.toJSONString(bu)); +// logger.info("-- >> bu"+JSONObject.toJSONString(bu)); businessRuleMap.put(bu.getId(),WxScoreRules.replaceBusinessName(currentBusinessRuleMap.get(bu.getId()),bu.getTitle())); }else { if (!businessRuleMap.containsKey(bu.getId())){