diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java index 1a223ff7e..3fd8a1522 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java @@ -47,8 +47,8 @@ public class WxUserResumeController extends BaseController { @ApiOperation("提交简历") @PostMapping("add") - public ResultData join(@RequestBody WxUserResume record) { - if (record.getUserId() == null || StringUtils.isBlank(record.getUserPhone())) { + public ResultData add(@RequestBody WxUserResume record) { + if (record.getUserId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "参数不能为空"); } record.updateTenantInfo(getTenantInfo()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java index 82ec3bdbf..d5849c38c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCouponBatch; import lombok.Data; @@ -15,4 +16,7 @@ public class WxGameUserActionLogVo implements Serializable{ private Integer couponOrderCount; private Integer addCreditSum; private Integer useCreditSum; + + @TableField(exist = false) + private String userPhone; } 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 6e56db837..85d76e6ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -79,6 +79,9 @@ public class WxGameServiceImpl implements WxGameService { @Autowired private WxOrderService wxOrderService; + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired @Qualifier("couponDetailRedisTemplate") RedisTemplate cdRedisTemplate; @@ -102,8 +105,20 @@ public class WxGameServiceImpl implements WxGameService { public PageInfo listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize) { PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameActionLogMapper.findUserSumList(record)); if (null != page && null != page.getList() && page.getList().size() > 0) { + List userIdList = new ArrayList(); + for (int i = 0 ; i < page.getList().size() ; i ++) { + WxGameUserActionLogVo vo = page.getList().get(i); + userIdList.add(vo.getUserId()); + } + Map userMap = wxCUserBasicInfoService.getUserMap(record, userIdList); for (int i = 0 ; i < page.getList().size() ; i ++) { WxGameUserActionLogVo vo = page.getList().get(i); + if (null != userMap) { + WxCUserBasicInfo user = userMap.get(vo.getUserId()); + if (null != user) { + vo.setUserPhone(user.getPhone()); + } + } } } return page;