diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index a06bd57e3..0138a187f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -1,15 +1,12 @@ package com.iformall.controller; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; -import com.iformall.domain.po.WxCUser; import com.iformall.service.WxActivityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 5b2511100..a23a06757 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxActivity; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 9bcb97d18..f3c92c6ea 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -771,7 +771,7 @@ public class WxUserGrantController extends BaseController { Integer levelScore = 0; Integer levelTarget= 0; userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); - List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); + List levelList = wxLevelConfigService.getByTenantId(getTenantInfo().getTenantId()); if (levelList.size() > 0) levelTarget = levelList.get(0).getPoints(); for (int i = 0; i levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); + WxCUserBasicInfo member = getMember(); + List levelList = wxLevelConfigService.getByTenantId(getTenantInfo().getTenantId()); String level = WxLevelConfigService.DEFAULT_LEVEL; Long levelId = 0L; for (WxLevelConfig levelConfig : levelList) { - if (user.getScore() >= levelConfig.getPoints()) { + if (member.getPoins() >= levelConfig.getPoints()) { if (levelConfig.getDiscountEnable().equals(EnumLevelConfigDiscountStatus.ENABLE.getCode())) levelId = levelConfig.getId(); level = levelConfig.getLevel(); @@ -940,7 +935,7 @@ public class WxUserGrantController extends BaseController { List levelMerchantList = wxLevelConfigService.findListCVo(levelMerchant); Map result = new HashMap(); - result.put("id", user.getUserId()); + result.put("id", member.getId()); result.put("level", level); result.put("levelMerchantList", levelMerchantList); return new ResultData(result);