Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
d66a76b6dc
3 changed files with 21 additions and 2 deletions
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java
  3. +15
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxUserResumeController.java View File

@@ -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());


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxGameUserActionLogVo.java View File

@@ -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;
}

+ 15
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java View File

@@ -79,6 +79,9 @@ public class WxGameServiceImpl implements WxGameService {
@Autowired
private WxOrderService wxOrderService;
@Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService;
@Autowired
@Qualifier("couponDetailRedisTemplate")
RedisTemplate<String, WxCouponCVo> cdRedisTemplate;
@@ -102,8 +105,20 @@ public class WxGameServiceImpl implements WxGameService {
public PageInfo<WxGameUserActionLogVo> listUserActionLogAsPage(WxGameActionLog record, Integer pageIndex, Integer pageSize) {
PageInfo<WxGameUserActionLogVo> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameActionLogMapper.findUserSumList(record));
if (null != page && null != page.getList() && page.getList().size() > 0) {
List<Long> userIdList = new ArrayList<Long>();
for (int i = 0 ; i < page.getList().size() ; i ++) {
WxGameUserActionLogVo vo = page.getList().get(i);
userIdList.add(vo.getUserId());
}
Map<Long, WxCUserBasicInfo> 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;


Loading…
Cancel
Save