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