diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 255d4ab8d..8d258b9ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -85,6 +85,19 @@ public class WxGameController extends BaseController { final PageInfo 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 page = wxGameService.listUserActionLogAsPage(wxGameLog, pageNum, pageSize); + return new ResultData(page); + } @ApiOperation("新增接口") @PostMapping("add") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java index 5efbf665a..715e7c14f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java +++ b/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 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(); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java index 3985f13fd..840ffe2a7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/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 userIdList; - - + + @TableField(exist = false) + private String couponName; + @TableField(exist = false) + private Integer couponCount; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxGameService.java b/mallinkService/src/main/java/com/iformall/service/WxGameService.java index dcb30f434..bd864bd3b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxGameService.java +++ b/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 listAsPage(WxGame record, Integer pageIndex, Integer pageSize); PageInfo listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize); + + List listUserGiftList(WxGameActionLog record); /** * 获取用户要玩的游戏信息 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 85d76e6ec..cebb2c889 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -101,6 +101,7 @@ public class WxGameServiceImpl implements WxGameService { return page; } + @Override public PageInfo listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize) { PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameActionLogMapper.findUserSumList(record)); @@ -123,6 +124,18 @@ public class WxGameServiceImpl implements WxGameService { } return page; } + + @Override + public List listUserGiftList(WxGameActionLog record) { +// PageInfo 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) {