Browse Source

/、user

release_toaliyun_real
xhxu 4 years ago
parent
commit
99fe47649a
5 changed files with 155 additions and 771 deletions
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  3. +2
    -24
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
  4. +43
    -112
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  5. +105
    -635
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java View File

@@ -219,7 +219,11 @@ public class WxUserStatisticsController extends BaseController {
if (wxCountList.get(i).getTotalCount() != null &&
wxCountList.get(i-1).getTotalCount() != null &&
wxCountList.get(i).getTotalCount() < wxCountList.get(i-1).getTotalCount()){
logger.info("修改前"+(i-1)+"=="+wxCountList.get(i-1).getTotalCount());
logger.info("修改前"+i+"=="+wxCountList.get(i).getTotalCount());
wxCountList.get(i).setTotalCount(wxCountList.get(i-1).getTotalCount());
logger.info("修改后"+(i-1)+"=="+wxCountList.get(i-1).getTotalCount());
logger.info("修改后"+i+"=="+wxCountList.get(i).getTotalCount());
}
}



+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java View File

@@ -150,6 +150,7 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);
List<Integer> targetAds = new ArrayList<>();
targetAds.add(EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode());
targetAds.add(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN_LIST.getCode());
targetAds.add(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode());
targetAds.add(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode());
targetAds.add(EnumCouponChannelType.COUPON_CHANNEL_ID_PRESS.getCode());


+ 2
- 24
mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java View File

@@ -14,13 +14,10 @@ import java.util.List;
public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, String> {

long findCountByFilter(WxCUserBasicInfoDto dto);
long findCountByFilter1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfoDto wxCUserBasicInfo);

List<WxCUserBasicInfo> findListByFilter(WxCUserBasicInfoDto dto);
List<WxCUserBasicInfo> findListByFilter1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfoDto wxCUserBasicInfo);
List<WxCUserBasicInfo> findList(WxCUserBasicInfo wxCUserBasicInfo);
List<WxCUserBasicInfo> findList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo wxCUserBasicInfo);
List<WxCUserBasicInfo> findListPhoneAndNameByIds(WxCUserBasicInfo wxCUserBasicInfo);
List<Long> findIdList(WxCUserBasicInfo wxCUserBasicInfo);
@@ -35,43 +32,24 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S
void updateNewId(CUserBaseVo record);

long findCountBySex(WxCUserBasicInfoDto dto);
long findCountBySex1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);

long findCountByAge(WxCUserBasicInfoDto dto);
long findCountByAge1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);


long findCountByScore(WxCUserBasicInfoDto dto);
long findCountByScore1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);

List<WxCUserBasicInfo> findListByScore(WxCUserBasicInfoDto dto);
List<WxCUserBasicInfo> findListByScore1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);


List<WxCUserBasicInfo> findBirthdayList(@Param("finalTenantId")String finalTenantId, @Param("begin")String begin, @Param("end")String end);
List<WxCUserBasicInfo> findBirthdayList1(@Param("finalTenantId")String finalTenantId,@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId, @Param("begin")String begin, @Param("end")String end);
List<WxCUserBasicInfo> findBirthdayList(@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId, @Param("begin")String begin, @Param("end")String end);

long findCount(WxCUserBasicInfoDto dto);
long findCount1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);

List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto);
List<UserCountVo> findCountHistory1(@Param("tenantInfo")TenantEntity tenantInfo,@Param("basicInfo")WxCUserBasicInfoDto dto);

List<WxCUserBasicInfoVo> findVoList(WxCUserBasicInfo wxCUserBasicInfo);
List<Long> findVoIdsList(WxCUserBasicInfo wxCUserBasicInfo);
List<WxCUserBasicInfoVo> findVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo);
List<Long> findVoIdsList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo);

Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo);
Integer countVoList1(@Param("tenantInfo")TenantEntity tenantInfo, @Param("basicInfo")WxCUserBasicInfo basicInfo);


long findGrowUserCount(@Param("finalTenantId")String finalTenantId);
long findGrowUserCount1(@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId);

//long findImportUserCount(@Param("finalTenantId")String finalTenantId);
//long findImportUserCount1(@Param("tenantId")String tenantId,@Param("parentTenantId")String parentTenantId);
long findGrowUserCount(@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId);

void incActRecordById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId);



+ 43
- 112
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -518,29 +518,19 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
@Override
public long countByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) {
WxCUserBasicInfoDto wxCUserBasicInfoDto = filtersToDto(tenantEntity, filterList);
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCountByFilter1(tenantEntity,wxCUserBasicInfoDto);
}else{
//直接查询本表
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto);
}

wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto);
}

@Override
public List<WxCUserBasicInfo> listByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) {
WxCUserBasicInfoDto wxCUserBasicInfoDto = filtersToDto(tenantEntity, filterList);
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findListByFilter1(tenantEntity,wxCUserBasicInfoDto);
}else{
//直接查询本表
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto);
}

wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto);
}

@Override
@@ -576,14 +566,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public PageInfo<WxCUserBasicInfo> listAsPage(TenantEntity tenantInfo, WxCUserBasicInfo wxCUserBasicInfo, Integer pageIndex, Integer pageSize) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList1(tenantInfo,wxCUserBasicInfo));
}else{
//直接查询本表
wxCUserBasicInfo.undateFinalTenantId(tenantInfo);
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(wxCUserBasicInfo));
}
wxCUserBasicInfo.setTenantId(tenantInfo.getTenantId());
wxCUserBasicInfo.undateFinalTenantId(tenantInfo);
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(wxCUserBasicInfo));
}

@Override
@@ -784,15 +769,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findCountBySex(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCountBySex1(tenantInfo,dto);
}else{
//直接查询本表
dto.setTenantId(tenantInfo.getFinalTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountBySex(dto);
}
dto.setTenantId(tenantInfo.getTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountBySex(dto);
}

@Override
@@ -802,15 +781,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findCountByAge(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCountByAge1(tenantInfo,dto);
}else{
//直接查询本表
dto.setTenantId(tenantInfo.getFinalTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByAge(dto);
}
dto.setTenantId(tenantInfo.getTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByAge(dto);
}

@Override
@@ -820,15 +793,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findCountByScore(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCountByScore1(tenantInfo,dto);
}else{
//直接查询本表
dto.setTenantId(tenantInfo.getFinalTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByScore(dto);
}
dto.setTenantId(tenantInfo.getTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByScore(dto);
}

@Override
@@ -838,14 +805,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public int exportDataCount(TenantEntity tenantInfo, WxCUserBasicInfo basicInfo) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.countVoList1(tenantInfo,basicInfo);
}else{
//直接查询本表
basicInfo.undateFinalTenantId(tenantInfo);
return wxCUserBasicInfoMapper.countVoList(basicInfo);
}
basicInfo.setTenantId(tenantInfo.getTenantId());
basicInfo.undateFinalTenantId(tenantInfo);
return wxCUserBasicInfoMapper.countVoList(basicInfo);
}

@Override
@@ -1223,15 +1185,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findCount(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCount1(tenantInfo,dto);
}else{
//直接查询本表
dto.setTenantId(tenantInfo.getFinalTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCount(dto);
}
dto.setTenantId(tenantInfo.getTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCount(dto);
}

@Override
@@ -1241,15 +1197,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public List<UserCountVo> findCountHistory(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) {
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findCountHistory1(tenantInfo,dto);
}else{
//直接查询本表
dto.setTenantId(tenantInfo.getFinalTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountHistory(dto);
}
dto.setTenantId(tenantInfo.getTenantId());
dto.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountHistory(dto);
}

@Override
@@ -1261,17 +1211,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findGrowUserCount(TenantEntity tenantEntity) {
String tenantId = tenantEntity.getTenantId();
String finalTenantId = tenantEntity.getTenantId();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getFinalTenantId());
}else{
//直接查询本表
String finalTenantId = tenantEntity.getTenantId();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
finalTenantId = tenantEntity.getParentTenantId();
}
return wxCUserBasicInfoMapper.findGrowUserCount(finalTenantId);
finalTenantId = tenantEntity.getParentTenantId();
}
return wxCUserBasicInfoMapper.findGrowUserCount(tenantId,finalTenantId);
}

@Override
@@ -1309,30 +1254,19 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public List<WxCUserBasicInfo> findListByScore(TenantEntity tenantEntity, WxCUserBasicInfoDto wxCUserBasicInfoDto) {
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findListByScore1(tenantEntity,wxCUserBasicInfoDto);
}else{
//直接查询本表
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto);
}
wxCUserBasicInfoDto.setTenantId(tenantEntity.getTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto);
}

@Override
public List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1) {
String tenantId = tenantEntity.getTenantId();
String finalTenantId = tenantEntity.getTenantId();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
//关联微信表查询
return wxCUserBasicInfoMapper.findBirthdayList1(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(),tenantEntity.getParentTenantId(),format,format1);
}else{
//直接查询本表
String finalTenantId = tenantEntity.getTenantId();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
finalTenantId = tenantEntity.getParentTenantId();
}
return wxCUserBasicInfoMapper.findBirthdayList(finalTenantId,format,format1);
finalTenantId = tenantEntity.getParentTenantId();
}
return wxCUserBasicInfoMapper.findBirthdayList(tenantId,finalTenantId,format,format1);
}

@Override
@@ -1352,13 +1286,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>();
basicInfo.setBegin((page-1)*20000);
basicInfo.setLimit(20000);
// if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){
// //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
// }else{
// basicInfo.undateFinalTenantId(tenantInfo);
// }

list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo);
basicInfo.undateFinalTenantId(tenantInfo);
basicInfo.undateFinalTenantId(tenantInfo);
list = wxCUserBasicInfoMapper.findVoList(basicInfo);
if (null == list || list.size() <= 0 ) {
return null;
}


+ 105
- 635
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
File diff suppressed because it is too large
View File


Loading…
Cancel
Save