Browse Source

fix bug

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
a04a51a8c5
4 changed files with 10 additions and 15 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +3
    -8
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java View File

@@ -92,7 +92,7 @@ public class WxCUserBasicInfoController extends BaseController {
info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); info.setLevel(WxLevelConfigService.DEFAULT_LEVEL);
} else { } else {
info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); info.setLevel(WxLevelConfigService.DEFAULT_LEVEL);
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(info.getTenantInfo());
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(info);
for (WxLevelConfig levelConfig : levelList) { for (WxLevelConfig levelConfig : levelList) {
if (info.getPoins() >= levelConfig.getPoints()) { if (info.getPoins() >= levelConfig.getPoints()) {
info.setLevel(levelConfig.getLevel()); info.setLevel(levelConfig.getLevel());
@@ -107,7 +107,7 @@ public class WxCUserBasicInfoController extends BaseController {
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId());
if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) {
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class);
info.setTagsList(wxCUserTagsService.findTagList(info.getTenantInfo(), ids));
info.setTagsList(wxCUserTagsService.findTagList(info, ids));
} }
} }
} }


+ 3
- 8
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -11,7 +11,9 @@ import org.apache.commons.lang3.StringUtils;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class TenantEntity extends BaseEntity { 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; private String tenantId;


@io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId")
@@ -30,11 +32,4 @@ public class TenantEntity extends BaseEntity {
setParentTenantId(info.getParentTenantId()); setParentTenantId(info.getParentTenantId());
} }
} }
public TenantEntity getTenantInfo() {
return new TenantEntity() {{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}};
}
} }

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java View File

@@ -450,7 +450,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
private int bindCarAddScore(WxCUserCar userCar) { private int bindCarAddScore(WxCUserCar userCar) {
int addScoreNumber = 0; int addScoreNumber = 0;
// 1. 获取score rules // 1. 获取score rules
WxScoreRules scoreRules = getScoreRules(userCar.getTenantInfo());
WxScoreRules scoreRules = getScoreRules(userCar);


// 2. 获取成长值 // 2. 获取成长值
addScoreNumber = scoreRules.getRule(EnumScoreType.BIND_CAR,WxScoreRules.SCORE); addScoreNumber = scoreRules.getRule(EnumScoreType.BIND_CAR,WxScoreRules.SCORE);
@@ -459,7 +459,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
updateScore(userCar.getCUserId(), addScoreNumber); updateScore(userCar.getCUserId(), addScoreNumber);


// 4. 记录历史 // 4. 记录历史
recordScoreHistory(addScoreNumber, userCar.getTenantInfo(), userCar.getCUserId(), EnumScoreType.BIND_CAR);
recordScoreHistory(addScoreNumber, userCar, userCar.getCUserId(), EnumScoreType.BIND_CAR);
return addScoreNumber; return addScoreNumber;
} }


@@ -552,7 +552,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
} }


// 2. 记录历史 // 2. 记录历史
recordReduceScoreHistory(scoreNum, reason, userInfo.getTenantInfo(), userInfo.getId(), EnumScoreType.MEM_REDUCE);
recordReduceScoreHistory(scoreNum, reason, userInfo, userInfo.getId(), EnumScoreType.MEM_REDUCE);
return score; return score;
} }




+ 2
- 2
mallinkService/src/main/java/com/iformall/utils/CreditUtil.java View File

@@ -103,14 +103,14 @@ public class CreditUtil {
if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) { if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) {
//设置过生日的用户 //设置过生日的用户
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) { if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService);
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo, wxScoreRulesService);
} else { } else {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate()); log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());
} }
} else { } else {
//发过生日券的用户或者享受过生日积分倍率的用户 //发过生日券的用户或者享受过生日积分倍率的用户
if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) { if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) {
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService);
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo, wxScoreRulesService);
} }
} }




Loading…
Cancel
Save