winter 1 год назад
Родитель
Сommit
1c9af0fd8c
5 измененных файлов: 39 добавлений и 3 удалений
  1. +13
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java
  2. +4
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java
  3. +5
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxGameService.java
  5. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java

+ 13
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java Просмотреть файл

@@ -85,6 +85,19 @@ public class WxGameController extends BaseController {
final PageInfo<WxGameUserActionLogVo> page = wxGameService.listUserActionLogAsPage(wxGameLog, pageNum, pageSize);
return new ResultData(page);
}
@ApiOperation("用户中奖记录接口")
@GetMapping("userGiftList")
public ResultData userGiftList(@ModelAttribute WxGameActionLog wxGameLog, Integer pageNum, Integer pageSize) {
if (null == wxGameLog) wxGameLog = new WxGameActionLog();
if (null == wxGameLog.getGameId()|| null == wxGameLog.getUserId()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"参数无效");
}
wxGameLog.updateTenantInfo(getTenantInfo());
final PageInfo<WxGameUserActionLogVo> page = wxGameService.listUserActionLogAsPage(wxGameLog, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("新增接口")
@PostMapping("add")


+ 4
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java Просмотреть файл

@@ -67,7 +67,10 @@ public class WxUserResumeController extends BaseController {
record.updateTenantInfo(getTenantInfo());
record.setUserId(this.getMemberId());
PageInfo<WxUserResume> page = wxUserResumeService.listAsPage(record, 1, 1);
return new ResultData(page);
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
return new ResultData(page.getList().get(0));
}
return new ResultData();
}
}

+ 5
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java Просмотреть файл

@@ -46,6 +46,9 @@ public class WxGameActionLog extends TenantEntity {
private String userPhone;
@TableField(exist = false)
private List<Long> userIdList;


@TableField(exist = false)
private String couponName;
@TableField(exist = false)
private Integer couponCount;
}

+ 4
- 0
mallinkService/src/main/java/com/iformall/service/WxGameService.java Просмотреть файл

@@ -1,5 +1,7 @@
package com.iformall.service;

import java.util.List;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxGame;
@@ -21,6 +23,8 @@ public interface WxGameService {
PageInfo<WxGame> listAsPage(WxGame record, Integer pageIndex, Integer pageSize);
PageInfo<WxGameUserActionLogVo> listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize);
List<WxGameActionLog> listUserGiftList(WxGameActionLog record);

/**
* 获取用户要玩的游戏信息


+ 13
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java Просмотреть файл

@@ -101,6 +101,7 @@ public class WxGameServiceImpl implements WxGameService {
return page;
}
@Override
public PageInfo<WxGameUserActionLogVo> listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize) {
PageInfo<WxGameUserActionLogVo> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameActionLogMapper.findUserSumList(record));
@@ -123,6 +124,18 @@ public class WxGameServiceImpl implements WxGameService {
}
return page;
}
@Override
public List<WxGameActionLog> listUserGiftList(WxGameActionLog record) {
// PageInfo<WxGame> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameMapper.findList(record));
// if (page.getSize() > 0) {
// for (WxGame game : page.getList()) {
// game.setGameTemplate(wxGameTemplateService.getById(game.getGameId()));
// }
// }
// return page;
return null;
}

@Override
public WxGame getOne(WxGame wxGame) {


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