diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java index 05227028a..a1ec54ef0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java @@ -38,6 +38,8 @@ public class WxLevelConfigController extends BaseController { @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig,Integer pageNum, Integer pageSize) { if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); + wxLevelConfig.setTenantId(getTenantId()); + wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 6f2189e42..962b0dfcd 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -11,8 +11,10 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserCar; +import com.iformall.domain.po.WxLevelConfig; import com.iformall.service.WxCUserCarService; import com.iformall.service.WxCUserService; +import com.iformall.service.WxLevelConfigService; import com.iformall.service.WxScoreRulesService; import com.iformall.utils.IPUtil; import io.swagger.annotations.Api; @@ -51,6 +53,9 @@ public class WxUserGrantController extends BaseController { @Autowired private WxScoreRulesService wxScoreRulesService; + @Autowired + WxLevelConfigService wxLevelConfigService; + /** * 用户登录 * @param map @@ -327,6 +332,16 @@ public class WxUserGrantController extends BaseController { @GetMapping("/userinfo") public ResultData getUserInfo() { WxCUser user = getUser(); + if (user.getScore() == null || user.getScore() == 0) { + user.setLevelName("无"); + } else { + List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); + for(WxLevelConfig levelConfig: levelList) { + if (user.getScore() > levelConfig.getPoints()) { + user.setLevelName(levelConfig.getLevel()); + } + } + } return new ResultData(Result.SUCCESS,"查询成功",user); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 4471f3482..7cf97dd6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -133,6 +133,10 @@ public class WxCUser implements Serializable { //渠道描述 @Transient protected String sceneDescription; + + //等级名称 + @Transient + private String levelName; public String getChannelName() { return channelName; @@ -319,6 +323,14 @@ public class WxCUser implements Serializable { this.sceneDescription = sceneDescription; } + public String getLevelName() { + return levelName; + } + + public void setLevelName(String levelName) { + this.levelName = levelName; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index 01e43eaea..2a10a1b97 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -92,11 +92,11 @@ public class WxLevelConfig implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Points_ASC("`points` ASC"),Points_DESC("`points` DESC") ,Level_ASC("`level` ASC"),Level_DESC("`level` DESC") ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ; private String value; Field(String value){ @@ -129,6 +129,8 @@ public class WxLevelConfig implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index a31d19a30..70e894f4a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -3,17 +3,26 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxLevelConfig; +import java.util.List; + public interface WxLevelConfigService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize); + + /** + * getByTenantId + * @param tenantId + * @return + */ + List getByTenantId(String tenantId); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 665927f50..560155eb5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.List; + @Service public class WxLevelConfigServiceImpl implements WxLevelConfigService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -24,6 +26,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxLevelConfigMapper.findList(record)); } + @Override + public List getByTenantId(String tenantId) { + WxLevelConfig wxLevelConfig = new WxLevelConfig(); + wxLevelConfig.setTenantId(tenantId); + wxLevelConfig.setSortColumns(WxLevelConfig.Field.Level_ASC); + return wxLevelConfigMapper.findList(wxLevelConfig); + } + @Override public WxLevelConfig getById(Long id) { return wxLevelConfigMapper.selectByPrimaryKey(id);