From a04a51a8c5897db7672a385c135761e4db6ed912 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 15 Jul 2020 17:00:20 +0800 Subject: [PATCH] fix bug --- .../controller/mem/WxCUserBasicInfoController.java | 4 ++-- .../com/iformall/domain/po/base/TenantEntity.java | 11 +++-------- .../service/impl/WxScoreRulesServiceImpl.java | 6 +++--- .../src/main/java/com/iformall/utils/CreditUtil.java | 4 ++-- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 19e17e131..6bd5f2b65 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -92,7 +92,7 @@ public class WxCUserBasicInfoController extends BaseController { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); } else { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); - List levelList = wxLevelConfigService.getByTenantInfo(info.getTenantInfo()); + List levelList = wxLevelConfigService.getByTenantInfo(info); for (WxLevelConfig levelConfig : levelList) { if (info.getPoins() >= levelConfig.getPoints()) { info.setLevel(levelConfig.getLevel()); @@ -107,7 +107,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - info.setTagsList(wxCUserTagsService.findTagList(info.getTenantInfo(), ids)); + info.setTagsList(wxCUserTagsService.findTagList(info, ids)); } } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 655364047..2b93e8a36 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -11,7 +11,9 @@ import org.apache.commons.lang3.StringUtils; @Data @EqualsAndHashCode(callSuper = true) public class TenantEntity extends BaseEntity { - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private static final long serialVersionUID = 1441638860618733611L; + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") @@ -30,11 +32,4 @@ public class TenantEntity extends BaseEntity { setParentTenantId(info.getParentTenantId()); } } - - public TenantEntity getTenantInfo() { - return new TenantEntity() {{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; - } } 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 244c2338c..71d5cae38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -450,7 +450,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private int bindCarAddScore(WxCUserCar userCar) { int addScoreNumber = 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(userCar.getTenantInfo()); + WxScoreRules scoreRules = getScoreRules(userCar); // 2. 获取成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.BIND_CAR,WxScoreRules.SCORE); @@ -459,7 +459,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(userCar.getCUserId(), addScoreNumber); // 4. 记录历史 - recordScoreHistory(addScoreNumber, userCar.getTenantInfo(), userCar.getCUserId(), EnumScoreType.BIND_CAR); + recordScoreHistory(addScoreNumber, userCar, userCar.getCUserId(), EnumScoreType.BIND_CAR); return addScoreNumber; } @@ -552,7 +552,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } // 2. 记录历史 - recordReduceScoreHistory(scoreNum, reason, userInfo.getTenantInfo(), userInfo.getId(), EnumScoreType.MEM_REDUCE); + recordReduceScoreHistory(scoreNum, reason, userInfo, userInfo.getId(), EnumScoreType.MEM_REDUCE); return score; } diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index ab8cd049e..21aa58678 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -103,14 +103,14 @@ public class CreditUtil { if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) { //设置过生日的用户 if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) { - birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo, wxScoreRulesService); } else { log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate()); } } else { //发过生日券的用户或者享受过生日积分倍率的用户 if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) { - birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo, wxScoreRulesService); } }