diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 7f6465d2b..ca8e45564 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -22,10 +22,14 @@ import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxCUserTags; +import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxTags; import com.simple.service.WxCUserBasicInfoService; import com.simple.service.WxCUserService; import com.simple.service.WxCUserTagsService; +import com.simple.service.WxCouponOrderService; +import com.simple.service.WxCouponService; import com.simple.service.WxTagsService; import io.swagger.annotations.Api; @@ -49,6 +53,12 @@ public class WxCUserBasicInfoController extends BaseController @Autowired private WxCUserService wxCUserService; + + @Autowired + private WxCouponOrderService wxCouponOrderService; + + @Autowired + private WxCouponService wxCouponService; private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); @@ -100,17 +110,18 @@ public class WxCUserBasicInfoController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { + WxCUserBasicInfo info = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); wxCUserBasicInfo.setTenantId(getTenantId()); - if(StringUtils.isNotBlank(wxCUserBasicInfo.getTags())) { + if(StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) { WxCUserTags record =new WxCUserTags(); - record.setUserId(wxCUserBasicInfo.getCUserId()); + record.setUserId(info.getCUserId()); record.setTenantId(getTenantId()); PageInfo page = wxCUserTagsService.listAsPage(record, 1, 1); if(page.getSize()>0) { WxCUserTags t = page.getList().get(0); record.setId(t.getId()); } - String tags = wxCUserBasicInfo.getTags(); + String tags = wxCUserBasicInfo.getTagIds(); List tagIdList = new ArrayList<>(); for(String t:tags.split(",")) { tagIdList.add(Long.valueOf(t)); @@ -143,13 +154,44 @@ public class WxCUserBasicInfoController extends BaseController WxTags wxTags =new WxTags(); wxTags.setIds(ids); PageInfo page = wxTagsService.listAsPage(wxTags, 1, 5000); - if(page.getSize()>0) { - info.setTagList(page.getList()); + String tagNames=""; + String tagIds=""; + List tagIdList = new ArrayList<>(); + for(WxTags wt:page.getList()) { + tagNames+=wt.getName()+"/"; + tagIds+=wt.getId()+","; + tagIdList.add(wt.getId()); + } + if(StringUtils.isNotBlank(tagNames)) { + info.setTagNames(tagNames.substring(0,tagNames.length()-1)); } + if(StringUtils.isNoneBlank(tagIds)) { + info.setTagIds(tagIds.substring(0,tagIds.length()-1)); + } + long count = wxCUserTagsService.findCountByTag(tagIdList); + info.setCount(count); } } return new ResultData(Result.SUCCESS,"查询成功",info); } + @ApiOperation("根据id查询接口") + @GetMapping("/findOrderCouponByUserId") + @ApiImplicitParam(name="userId",value="userId",dataType="Long", paramType = "query",required=true) + public ResultData findOrderCouponByUserId(Long userId,Integer pageNum, Integer pageSize) { + WxCouponOrder corder = new WxCouponOrder(); + corder.setCUserId(userId); + corder.setTenantId(getTenantId()); + PageInfo page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); + if(page.getSize()>0) { + List list = page.getList(); + for(WxCouponOrder c:list) { + WxCoupon coupon = wxCouponService.getById(c.getCouponId()); + + } + } + + return new ResultData(Result.SUCCESS,"查询成功"); + } } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java index c3f5886cb..89abc7e02 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -83,25 +83,35 @@ public class WxCUserBasicInfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; @Transient - private String tags; + private String tagIds; @Transient - private List tagList; - + private String tagNames; + @Transient + private long count; + + public long getCount() { + return count; + } - public List getTagList() { - return tagList; + public void setCount(long count) { + this.count = count; } - public void setTagList(List tagList) { - this.tagList = tagList; + public String getTagNames() { + return tagNames; } - public String getTags() { - return tags; + public void setTagNames(String tagNames) { + this.tagNames = tagNames; + } + + + public String getTagIds() { + return tagIds; } - public void setTags(String tags) { - this.tags = tags; + public void setTagIds(String tagIds) { + this.tagIds = tagIds; } public String getPhone() { diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java new file mode 100644 index 000000000..74c08d0c7 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java @@ -0,0 +1,14 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCouponOrder; + +public class WxUserCouponVo extends WxCouponOrder{ + + /** + * + */ + private static final long serialVersionUID = 6687954932922444531L; + + + +}