Просмотр исходного кода

[等级][新增]:添加等级实现

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
15fab85b3f
6 измененных файлов: 54 добавлений и 4 удалений
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java
  2. +15
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  4. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java
  5. +11
    -2
      mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java
  6. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java

+ 2
- 0
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<WxLevelConfig> page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize);
return new ResultData(page);
}


+ 15
- 0
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<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);
}



+ 12
- 0
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")


+ 4
- 2
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();
}


+ 11
- 2
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<WxLevelConfig> listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize);

/**
* getByTenantId
* @param tenantId
* @return
*/
List<WxLevelConfig> getByTenantId(String tenantId);
/**
* 根据Id获得实体


+ 10
- 0
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<WxLevelConfig> 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);


Загрузка…
Отмена
Сохранить