|
|
|
@@ -771,7 +771,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
Integer levelScore = 0; |
|
|
|
Integer levelTarget= 0; |
|
|
|
userVo.setLevelName(WxLevelConfigService.DEFAULT_LEVEL); |
|
|
|
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); |
|
|
|
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(getTenantInfo().getTenantId()); |
|
|
|
if (levelList.size() > 0) |
|
|
|
levelTarget = levelList.get(0).getPoints(); |
|
|
|
for (int i = 0; i<levelList.size(); i++) { |
|
|
|
@@ -917,18 +917,13 @@ public class WxUserGrantController extends BaseController { |
|
|
|
@RequestMapping("/getDiscountInfo") |
|
|
|
@ApiOperation(value = "获取用户折扣率", notes = "") |
|
|
|
public ResultData getDiscountInfo() { |
|
|
|
WxCUser user = getUser(); |
|
|
|
if (!user.isBasicInfo()) { |
|
|
|
logger.error("暂未成为会员,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); |
|
|
|
WxCUserBasicInfo member = getMember(); |
|
|
|
List<WxLevelConfig> 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<WxLevelMerchantCVo> levelMerchantList = wxLevelConfigService.findListCVo(levelMerchant); |
|
|
|
|
|
|
|
Map<String, Object> 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); |
|
|
|
|