xhxu 3 лет назад
Родитель
Сommit
19b454f3b7
2 измененных файлов: 3 добавлений и 1 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Просмотреть файл

@@ -777,7 +777,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Override @Override
public void oldAddCreditWithNewConsume(TenantEntity tenantEntity, WxCreditHistory wxCreditHistory, WxCUserBasicInfo basicInfo,EnumAppPlat plat) { public void oldAddCreditWithNewConsume(TenantEntity tenantEntity, WxCreditHistory wxCreditHistory, WxCUserBasicInfo basicInfo,EnumAppPlat plat) {
if(!EnumScoreType.SPEND_CREDIT.getCode().equals(wxCreditHistory.getCreditType()) if(!EnumScoreType.SPEND_CREDIT.getCode().equals(wxCreditHistory.getCreditType())
&& !EnumScoreType.CONSUMPTION.getCode().equals(wxCreditHistory.getCreditType())){
|| !EnumScoreType.CONSUMPTION.getCode().equals(wxCreditHistory.getCreditType())){
return; return;
} }




+ 2
- 0
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<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>(); Map<Integer,JSONObject> businessRuleMap = new HashMap<Integer,JSONObject>();
List<WxBusiness> rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null); List<WxBusiness> rootBusiness = wxBusinessService.findListAll(true,tenantEntity, null, null);
@@ -151,6 +152,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
for (int i = 0 ; i < rootBusiness.size(); i++){ for (int i = 0 ; i < rootBusiness.size(); i++){
WxBusiness bu = rootBusiness.get(i); WxBusiness bu = rootBusiness.get(i);
if (currentBusinessRuleMap.containsKey(bu.getId())) { if (currentBusinessRuleMap.containsKey(bu.getId())) {
logger.info("-- >> bu"+JSONObject.toJSONString(bu));
businessRuleMap.put(bu.getId(),WxScoreRules.replaceBusinessName(currentBusinessRuleMap.get(bu.getId()),bu.getTitle())); businessRuleMap.put(bu.getId(),WxScoreRules.replaceBusinessName(currentBusinessRuleMap.get(bu.getId()),bu.getTitle()));
}else { }else {
if (!businessRuleMap.containsKey(bu.getId())){ if (!businessRuleMap.containsKey(bu.getId())){


Загрузка…
Отмена
Сохранить