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

[A端][修改]:会员系统相关接口升级

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

+ 23
- 22
mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java Просмотреть файл

@@ -55,11 +55,11 @@ public class WxUserStructureController extends BaseController {
}
//保密
dto.setSex(0);
long secrecy = getCount(dto);
long secrecy = wxCUserBasicInfoService.findCountBySex(dto);
dto.setSex(1);
long boy = getCount(dto);
long boy = wxCUserBasicInfoService.findCountBySex(dto);
dto.setSex(2);
long girl = getCount(dto);
long girl = wxCUserBasicInfoService.findCountBySex(dto);
Long all = secrecy + boy + girl;
List<UserStructureVo> vos = new ArrayList<>();
vos.add(getVo(boy, all, "男", 1));
@@ -81,7 +81,7 @@ public class WxUserStructureController extends BaseController {
endTime = c.getTime();
}
dto.setEndTime(endTime);
long all = wxCUserBasicInfoService.findCountByAge(dto);
long all = wxCUserBasicInfoService.findCount(dto);
List<UserStructureVo> vos = new ArrayList<>();
Calendar c = Calendar.getInstance();
for (EnumAgeInfo a : EnumAgeInfo.values()) {
@@ -135,7 +135,7 @@ public class WxUserStructureController extends BaseController {
UserStructureVo vo = new UserStructureVo();
vo.setSortNum(j);
j++;
vo.setName(new SimpleDateFormat("MM-dd").format(dto.getStartTime()));
vo.setName(new SimpleDateFormat("MM/dd").format(dto.getStartTime()));
vo.setCount(count);
wxnewCountVos.add(vo);
}
@@ -209,7 +209,7 @@ public class WxUserStructureController extends BaseController {
UserStructureVo vo = new UserStructureVo();
vo.setSortNum(j);
j++;
vo.setName(new SimpleDateFormat("MM-dd").format(dto.getStartTime()));
vo.setName(new SimpleDateFormat("MM/dd").format(dto.getStartTime()));
vo.setCount(count);
newCountVos.add(vo);
}
@@ -278,15 +278,17 @@ public class WxUserStructureController extends BaseController {
}
}
}
PageInfo<WxCUser> page = wxCUserService.listByChannel(sceneList, pageNum, pageSize);
PageInfo<WxCUser> page = wxCUserService.listByChannel(getTenantId(), sceneList, pageNum, pageSize);
for (WxCUser u : page.getList()) {
WxUserChannel c = new WxUserChannel();
c.setSceneAddress(u.getSceneAddress());
PageInfo<WxUserChannel> uc = wxUserChannelService.listAsPage(c, 1, 1);
if (uc.getSize() > 0) {
u.setChannelName(uc.getList().get(0).getChannelName());
u.setSceneDescription(uc.getList().get(0).getDescription());
} else {
u.setChannelName("其他来源");
u.setSceneDescription("不详");
}
}

@@ -306,23 +308,22 @@ public class WxUserStructureController extends BaseController {


private long getCountByAge(EnumAgeInfo a, Calendar c, WxCUserBasicInfoDto dto) {
c.add(Calendar.YEAR, -a.getEnd());
Date startTime = c.getTime();
c.clear();
c.setTime(startTime);
c.add(Calendar.YEAR, a.getEnd() - a.getStart());
Date endTime = c.getTime();
dto.setBirthStartTime(startTime);
dto.setBirthEndTime(endTime);
return wxCUserBasicInfoService.findCountByAge(dto);
}
if (a.getStart() != 0 || a.getEnd() != 0) {
c.add(Calendar.YEAR, -a.getEnd());
Date startTime = c.getTime();
c.clear();
c.setTime(startTime);
c.add(Calendar.YEAR, a.getEnd() - a.getStart());
Date endTime = c.getTime();
dto.setBirthStartTime(startTime);
dto.setBirthEndTime(endTime);
} else {

dto.setBirthStartTime(null);
dto.setBirthEndTime(null);
}

//通过性别获取数量
private long getCount(WxCUserBasicInfoDto dto) {
// wxCUserBasicInfoService.findCountBySex(dto) basic表与cuser表示对应的,先有cuser 才有basic
//所有这里不需要再去查basic
return wxCUserService.findCount(dto);
return wxCUserBasicInfoService.findCountByAge(dto);
}

private UserStructureVo getVo(long count, long all, String name, Integer num) {


+ 12
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java Просмотреть файл

@@ -21,7 +21,10 @@ public class WxCUser implements Serializable {
protected List<Long> ids;
@Transient
protected String sortColumns;
@Transient
protected String sceneDescription;


public Long getId() {
return id;
}
@@ -308,6 +311,14 @@ public class WxCUser implements Serializable {
this.loginCount = loginCount;
}

public String getSceneDescription() {
return sceneDescription;
}

public void setSceneDescription(String sceneDescription) {
this.sceneDescription = sceneDescription;
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumAgeInfo.java Просмотреть файл

@@ -7,7 +7,8 @@ public enum EnumAgeInfo {
FOURTH_SLOT(4,35,44,"35岁-44岁"),
FIFTH_SLOT(5,45,54,"45岁-54岁"),
SIXTH_SLOT(6,54,60,"55岁-60岁"),
SEVENTH_SLOT(7,60,200,"60岁以上")
SEVENTH_SLOT(7,60,200,"60岁以上"),
UNKNOWN(8,0,0,"不详")
;
private EnumAgeInfo(Integer sortNum,Integer start,Integer end,String desc) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java Просмотреть файл

@@ -20,6 +20,6 @@ public interface WxCUserMapper extends CommonMapper<WxCUser, Long> {
long findCount(WxCUserBasicInfoDto dto);

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

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCUserService.java Просмотреть файл

@@ -71,7 +71,7 @@ public interface WxCUserService {
* @param pageSize
* @return
*/
PageInfo<WxCUser> listByChannel(List<String> sceneList, Integer pageIndex, Integer pageSize);
PageInfo<WxCUser> listByChannel(String tenantId, List<String> sceneList, Integer pageIndex, Integer pageSize);


/**


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java Просмотреть файл

@@ -80,8 +80,8 @@ public class WxCUserServiceImpl implements WxCUserService {
}

@Override
public PageInfo<WxCUser> listByChannel(List<String> sceneList, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(sceneList));
public PageInfo<WxCUser> listByChannel(String tenantId, List<String> sceneList, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.listByChannel(sceneList, tenantId));
}



+ 16
- 5
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -110,18 +110,22 @@
</update>

<select id="findCountBySex" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long">
select count(id) from wx_c_user_basic_info where sex =#{sex}
select count(id) from wx_c_user_basic_info
where sex =#{sex}
<if test=" null != startTime ">
and create_date &gt;= #{startTime}
</if>
<if test=" null != endTime">
and create_date &lt;= #{endTime}
</if>
<if test="null != tenantId">
and tenant_id =#{tenantId}
</if>
</select>


<select id="findCountByAge" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long">
select count(id) from wx_c_user_basic_info where birthdate is not NULL
select count(id) from wx_c_user_basic_info where 1=1
<if test=" null != startTime ">
and create_date &gt;= #{startTime}
</if>
@@ -132,16 +136,23 @@
<if test=" null != birthStartTime ">
and birthdate &gt;= #{birthStartTime}
</if>

<if test=" null != birthEndTime">
and birthdate &lt;= #{birthEndTime}
</if>

<if test=" null == birthStartTime and null == birthEndTime">
and birthdate is null
</if>

<if test="null != tenantId">
and tenant_id =#{tenantId}
</if>

</select>
<select id="findCount" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long">
select count(id) from wx_c_user_basic_info where 1=1
<if test=" null != sex ">
and gender =#{sex}
</if>
<if test=" null != startTime ">
and create_date &gt;= #{startTime}
</if>


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

@@ -189,8 +189,11 @@
</if>
</select>

<select id="listByChannel" resultMap="BaseResultMap" parameterType="java.util.List">
<select id="listByChannel" resultMap="BaseResultMap" >
select id,nick_name,phone,create_date,scene_address from wx_c_user where 1=1
<if test="null != tenantId">
and tenant_id =#{tenantId}
</if>
<if test=" sceneList!= null ">
and scene_address in
<foreach collection="sceneList" index="index" item="scene" open="(" separator="," close=")">


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