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 85d36ea61..528d864af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -777,7 +777,7 @@ 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; } 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 c69b9a611..8fa23dbc6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -144,6 +144,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } } } + logger.info("mysql >> data"+JSONObject.toJSONString(currentBusinessRuleMap)); //根据业态来匹配 Map businessRuleMap = new HashMap(); List rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); @@ -151,6 +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)); businessRuleMap.put(bu.getId(),WxScoreRules.replaceBusinessName(currentBusinessRuleMap.get(bu.getId()),bu.getTitle())); }else { if (!businessRuleMap.containsKey(bu.getId())){