Przeglądaj źródła

[会员管理][修改]字段调整

release_toaliyun_real
jinguo24@163.com 7 lat temu
rodzic
commit
9980949dac
3 zmienionych plików z 82 dodań i 16 usunięć
  1. +47
    -5
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java
  2. +21
    -11
      mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java
  3. +14
    -0
      mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java

+ 47
- 5
mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java Wyświetl plik

@@ -22,10 +22,14 @@ import com.simple.domain.dto.WxCuerBasicInfoDto;
import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCUser;
import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxCUserBasicInfo;
import com.simple.domain.po.WxCUserTags; 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.domain.po.WxTags;
import com.simple.service.WxCUserBasicInfoService; import com.simple.service.WxCUserBasicInfoService;
import com.simple.service.WxCUserService; import com.simple.service.WxCUserService;
import com.simple.service.WxCUserTagsService; import com.simple.service.WxCUserTagsService;
import com.simple.service.WxCouponOrderService;
import com.simple.service.WxCouponService;
import com.simple.service.WxTagsService; import com.simple.service.WxTagsService;


import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -49,6 +53,12 @@ public class WxCUserBasicInfoController extends BaseController
@Autowired @Autowired
private WxCUserService wxCUserService; private WxCUserService wxCUserService;
@Autowired
private WxCouponOrderService wxCouponOrderService;
@Autowired
private WxCouponService wxCouponService;


private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class);
@@ -100,17 +110,18 @@ public class WxCUserBasicInfoController extends BaseController
@ApiOperation("根据id更新接口") @ApiOperation("根据id更新接口")
@PostMapping("update") @PostMapping("update")
public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) {
WxCUserBasicInfo info = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId());
wxCUserBasicInfo.setTenantId(getTenantId()); wxCUserBasicInfo.setTenantId(getTenantId());
if(StringUtils.isNotBlank(wxCUserBasicInfo.getTags())) {
if(StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) {
WxCUserTags record =new WxCUserTags(); WxCUserTags record =new WxCUserTags();
record.setUserId(wxCUserBasicInfo.getCUserId());
record.setUserId(info.getCUserId());
record.setTenantId(getTenantId()); record.setTenantId(getTenantId());
PageInfo<WxCUserTags> page = wxCUserTagsService.listAsPage(record, 1, 1); PageInfo<WxCUserTags> page = wxCUserTagsService.listAsPage(record, 1, 1);
if(page.getSize()>0) { if(page.getSize()>0) {
WxCUserTags t = page.getList().get(0); WxCUserTags t = page.getList().get(0);
record.setId(t.getId()); record.setId(t.getId());
} }
String tags = wxCUserBasicInfo.getTags();
String tags = wxCUserBasicInfo.getTagIds();
List<Long> tagIdList = new ArrayList<>(); List<Long> tagIdList = new ArrayList<>();
for(String t:tags.split(",")) { for(String t:tags.split(",")) {
tagIdList.add(Long.valueOf(t)); tagIdList.add(Long.valueOf(t));
@@ -143,13 +154,44 @@ public class WxCUserBasicInfoController extends BaseController
WxTags wxTags =new WxTags(); WxTags wxTags =new WxTags();
wxTags.setIds(ids); wxTags.setIds(ids);
PageInfo<WxTags> page = wxTagsService.listAsPage(wxTags, 1, 5000); PageInfo<WxTags> page = wxTagsService.listAsPage(wxTags, 1, 5000);
if(page.getSize()>0) {
info.setTagList(page.getList());
String tagNames="";
String tagIds="";
List<Long> 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); 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<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize);
if(page.getSize()>0) {
List<WxCouponOrder> list = page.getList();
for(WxCouponOrder c:list) {
WxCoupon coupon = wxCouponService.getById(c.getCouponId());
}
}
return new ResultData(Result.SUCCESS,"查询成功");
}
} }

+ 21
- 11
mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java Wyświetl plik

@@ -83,25 +83,35 @@ public class WxCUserBasicInfo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name")
private String name; private String name;
@Transient @Transient
private String tags;
private String tagIds;
@Transient @Transient
private List<WxTags> tagList;
private String tagNames;
@Transient
private long count;

public long getCount() {
return count;
}


public List<WxTags> getTagList() {
return tagList;
public void setCount(long count) {
this.count = count;
} }


public void setTagList(List<WxTags> 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() { public String getPhone() {


+ 14
- 0
mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java Wyświetl plik

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

Ładowanie…
Anuluj
Zapisz