diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java index cf829f4e1..c7a35d85b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -415,11 +416,12 @@ public class WxUserStructureController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData findUserByChannel(String channelName, Integer pageNum, Integer pageSize) { + public ResultData findUserByChannel(@ModelAttribute WxCUser wxCUser, + Integer pageNum, Integer pageSize) { List sceneList = null; - if (StringUtils.isNotBlank(channelName)) { + if (StringUtils.isNotBlank(wxCUser.getChannelName())) { WxUserChannel c = new WxUserChannel(); - c.setChannelName(channelName); + c.setChannelName(wxCUser.getChannelName()); PageInfo page = wxUserChannelService.listAsPage(c, 1, 100); if (page.getSize() > 0) { sceneList = new ArrayList<>(); @@ -428,7 +430,8 @@ public class WxUserStructureController extends BaseController { } } } - PageInfo page = wxCUserService.listByChannel(getTenantId(), sceneList, pageNum, pageSize); + wxCUser.setSceneList(sceneList); + PageInfo page = wxCUserService.listByChannel(wxCUser, pageNum, pageSize); for (WxCUser u : page.getList()) { WxUserChannel c = new WxUserChannel(); c.setSceneAddress(u.getSceneAddress()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 23c0d393c..5665984fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -138,14 +138,47 @@ public class WxCUser implements Serializable { this.extraInfo = extraInfo; } + //渠道名称 @Transient - private String channelName; //渠道描述 @Transient protected String sceneDescription; + @Transient + List sceneList; + + @Transient + protected Date startDate; + + @Transient + protected Date endDate; + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public List getSceneList() { + return sceneList; + } + + public void setSceneList(List sceneList) { + this.sceneList = sceneList; + } + public String getChannelName() { return channelName; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index f1371fcbe..70ae3c9a7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -1,5 +1,6 @@ package com.iformall.mapper; +import java.util.HashMap; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -12,14 +13,12 @@ public interface WxCUserMapper extends CommonMapper { List findList(WxCUser wxCUser); - WxCUser findByOpenId(WxCUser record); WxCUser findByToken(String token); long findCount(WxCUserBasicInfoDto dto); - - List listByChannel(@Param("sceneList")List sceneList, @Param("tenantId")String tenantId); + List listByChannel(WxCUser wxCUser); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java index a7342ec42..2eaad11b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java @@ -1,5 +1,6 @@ package com.iformall.service; +import java.util.HashMap; import java.util.List; import com.github.pagehelper.PageInfo; @@ -66,12 +67,12 @@ public interface WxCUserService { /** * 通过渠道获取会员信息 - * @param sceneList + * @param user * @param pageIndex * @param pageSize * @return */ - PageInfo listByChannel(String tenantId, List sceneList, Integer pageIndex, Integer pageSize); + PageInfo listByChannel(WxCUser user, Integer pageIndex, Integer pageSize); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index d4dc0c2a8..4fb8573cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.List; @Service @@ -93,8 +94,8 @@ public class WxCUserServiceImpl implements WxCUserService { } @Override - public PageInfo listByChannel(String tenantId, List sceneList, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(sceneList, tenantId)); + public PageInfo listByChannel(WxCUser user, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(user)); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 963502884..1fa09fe23 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -203,6 +203,12 @@ and tenant_id =#{tenantId} + + and create_date >= #{startDate} + + + and create_date < #{endDate} + and scene_address in