Просмотр исходного кода

[A端][新增]:会员拓客分析增加过滤器

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
52693f494c
6 измененных файлов: 55 добавлений и 12 удалений
  1. +7
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java
  2. +34
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java
  3. +2
    -3
      mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxCUserService.java
  5. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  6. +6
    -0
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml

+ 7
- 4
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<String> sceneList = null;
if (StringUtils.isNotBlank(channelName)) {
if (StringUtils.isNotBlank(wxCUser.getChannelName())) {
WxUserChannel c = new WxUserChannel();
c.setChannelName(channelName);
c.setChannelName(wxCUser.getChannelName());
PageInfo<WxUserChannel> page = wxUserChannelService.listAsPage(c, 1, 100);
if (page.getSize() > 0) {
sceneList = new ArrayList<>();
@@ -428,7 +430,8 @@ public class WxUserStructureController extends BaseController {
}
}
}
PageInfo<WxCUser> page = wxCUserService.listByChannel(getTenantId(), sceneList, pageNum, pageSize);
wxCUser.setSceneList(sceneList);
PageInfo<WxCUser> page = wxCUserService.listByChannel(wxCUser, pageNum, pageSize);
for (WxCUser u : page.getList()) {
WxUserChannel c = new WxUserChannel();
c.setSceneAddress(u.getSceneAddress());


+ 34
- 1
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<String> 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<String> getSceneList() {
return sceneList;
}

public void setSceneList(List<String> sceneList) {
this.sceneList = sceneList;
}

public String getChannelName() {
return channelName;
}


+ 2
- 3
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<WxCUser, Long> {

List<WxCUser> findList(WxCUser wxCUser);
WxCUser findByOpenId(WxCUser record);

WxCUser findByToken(String token);
long findCount(WxCUserBasicInfoDto dto);

List<WxCUser> listByChannel(@Param("sceneList")List<String> sceneList, @Param("tenantId")String tenantId);
List<WxCUser> listByChannel(WxCUser wxCUser);

}

+ 3
- 2
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<WxCUser> listByChannel(String tenantId, List<String> sceneList, Integer pageIndex, Integer pageSize);
PageInfo<WxCUser> listByChannel(WxCUser user, Integer pageIndex, Integer pageSize);


/**


+ 3
- 2
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<WxCUser> listByChannel(String tenantId, List<String> sceneList, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(sceneList, tenantId));
public PageInfo<WxCUser> listByChannel(WxCUser user, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(user));
}




+ 6
- 0
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Просмотреть файл

@@ -203,6 +203,12 @@
<if test="null != tenantId">
and tenant_id =#{tenantId}
</if>
<if test=" null != startDate ">
and create_date &gt;= #{startDate}
</if>
<if test=" null != endDate">
and create_date &lt; #{endDate}
</if>
<if test=" sceneList!= null ">
and scene_address in
<foreach collection="sceneList" index="index" item="scene" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить