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 4fb8fa066..255d4ab8d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxGame; import com.iformall.domain.po.WxGameActionLog; import com.iformall.domain.po.WxGameUserCount; @@ -14,11 +15,16 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxGameUserActionLogVo; import com.iformall.enums.EnumGameStatus; import com.iformall.exception.MallinkException; +import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxGameService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +39,9 @@ public class WxGameController extends BaseController { @Autowired private WxGameService wxGameService; + + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -60,6 +69,19 @@ public class WxGameController extends BaseController { } wxGameLog.updateTenantInfo(getTenantInfo()); wxGameLog.setSortColumns("user_id asc"); + if (StringUtils.isNotBlank(wxGameLog.getUserPhone())) { + WxCUserBasicInfo iq = new WxCUserBasicInfo(); + iq.setFinalTenantId(wxGameLog.getFinalTenantId()); + iq.setPhone(wxGameLog.getUserPhone()); + List userIdList = wxCUserBasicInfoService.findIdList(iq); + if (null == userIdList || userIdList.size() <= 0 ) { + userIdList = new ArrayList(); + userIdList.add(-1L); + wxGameLog.setUserIdList(userIdList); + }else { + wxGameLog.setUserIdList(userIdList); + } + } final PageInfo page = wxGameService.listUserActionLogAsPage(wxGameLog, pageNum, pageSize); return new ResultData(page); } @@ -145,6 +167,12 @@ public class WxGameController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"参数错误"); } gameUserCount.updateTenantInfo(getTenantInfo()); + + WxCUserBasicInfo cuser = wxCUserBasicInfoService.getById(gameUserCount.getUserId(), gameUserCount.getFinalTenantId()); + if (null == cuser) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"未查询到会员"); + } + gameUserCount.setUserNickName(cuser.getNickName()); try{ wxGameService.saveOrUpdateGameUserCount(gameUserCount); 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 036f2355c..3985f13fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGameActionLog.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import java.util.List; @TableName(value = "wx_game_action_log") @Data @@ -40,6 +41,11 @@ public class WxGameActionLog extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "", name = "usedCredit") private Integer addCredit; + + @TableField(exist = false) + private String userPhone; + @TableField(exist = false) + private List userIdList; } diff --git a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml index b8760b911..a06460a89 100644 --- a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml @@ -163,6 +163,13 @@ sum(add_credit) as add_credit_sum,sum(used_credit) as use_credit_sum from wx_game_action_log where `tenant_id` = #{tenantId} and `game_id` = #{gameId} + + and user_id in + + #{uidItem} + + + group by user_id