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

/. 报表-001.1

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
59d96fb728
10 измененных файлов: 44 добавлений и 11 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +2
    -1
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +2
    -1
      mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMallService.java
  7. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxUserVisitService.java
  8. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  9. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  10. +14
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -62,7 +62,7 @@ public class TenantInfoImpl implements TenantInfo {
"fengniao_map_config",
"wx_c_user",
"tt_c_user",
"wx_c_user_car",
"wx_user_visit",

};
@@ -72,6 +72,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_authorizer_info",
"wx_c_user",
"tt_c_user",
"wx_user_visit",
"wx_c_user_car",
"wx_c_user_from_b",
"wx_c_user_tags",


+ 2
- 1
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -51,7 +51,7 @@ public class TenantInfoImpl implements TenantInfo {
"fengniao_map_config",
"wx_c_user",
"tt_c_user",
"wx_c_user_car",
"wx_user_visit",
};
private static String[] filterSubTables = new String[] {
@@ -60,6 +60,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_authorizer_info",
"wx_c_user",
"tt_c_user",
"wx_user_visit",
"wx_c_user_basic_info",
"user_basic_info_address",
"wx_c_user_basic_child",


+ 2
- 1
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -56,7 +56,7 @@ public class TenantInfoImpl implements TenantInfo {
"fengniao_map_config",
"wx_c_user",
"tt_c_user",
"wx_c_user_car",
"wx_user_visit",
};
private static String[] filterSubTables = new String[] {
@@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_authorizer_info",
"wx_c_user",
"tt_c_user",
"wx_user_visit",
"wx_c_user_basic_info",
"user_basic_info_address",
"wx_c_user_basic_child",


+ 2
- 1
mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -56,7 +56,7 @@ public class TenantInfoImpl implements TenantInfo {
"fengniao_map_config",
"wx_c_user",
"tt_c_user",
"wx_c_user_car",
"wx_user_visit",
};
private static String[] filterSubTables = new String[] {
@@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo {
"wx_authorizer_info",
"wx_c_user",
"tt_c_user",
"wx_user_visit",
"wx_c_user_basic_info",
"user_basic_info_address",
"wx_c_user_basic_child",


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

@@ -10,7 +10,7 @@ import java.util.*;
@TableName(value = "wx_user_visit")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxUserVisit extends TenantEntity {
public class WxUserVisit extends TenantEntity {

protected Long id;



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

@@ -91,4 +91,6 @@ public interface WxMallService {
ResultData addAadmin(WxMall wxMall);

boolean mallValid(Long loginUserId,WxMall mall);

boolean isgroupSupport(TenantEntity tenantEntity);
}

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

@@ -4,6 +4,7 @@ import java.util.*;
import com.github.pagehelper.PageInfo;
import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.domain.po.WxUserVisit;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.TouchUsersReportVo;

public interface WxUserVisitService {
@@ -32,7 +33,7 @@ public interface WxUserVisitService {
* @param id
* @return
*/
WxUserVisit getById(Long id);
WxUserVisit getById(Long id, TenantEntity tenantEntity);
/**
* 保存或更新实体
@@ -46,7 +47,7 @@ public interface WxUserVisitService {
*
* @param id
*/
void deleteById(Long id);
void deleteById(Long id, TenantEntity tenantEntity);
List<TouchUsersReportVo> touchUsersReportList(MarkingCouponDataReportDto markingCouponDataReportDto);


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

@@ -91,6 +91,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
@Autowired
WxTagsService wxTagsService;

@Autowired
WxMallService wxMallService;


/***************user filter start******************************************/

@@ -1171,6 +1174,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public long findCount(WxCUserBasicInfoDto dto) {
if(wxMallService.isgroupSupport(dto)){
dto.setTenantId(null);
}
return wxCUserBasicInfoMapper.findCount(dto);
}



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

@@ -386,4 +386,14 @@ public class WxMallServiceImpl implements WxMallService {
return false;
}

@Override
public boolean isgroupSupport(TenantEntity tenantEntity) {
WxMall mall = this.getByTenantId(tenantEntity.getTenantId());
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) &&
StringUtils.isBlank(mall.getParentTenantId())) {
return true;
}
return false;
}

}

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

@@ -1,10 +1,13 @@
package com.iformall.service.impl;

import java.util.*;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.domain.po.WxUserVisit;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.TouchUsersReportVo;
import com.iformall.mapper.WxUserVisitMapper;
import com.iformall.service.WxUserVisitService;
@@ -16,6 +19,7 @@ import com.iformall.common.IdWorker;

@Service
public class WxUserVisitServiceImpl implements WxUserVisitService {

private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
@@ -33,8 +37,11 @@ public class WxUserVisitServiceImpl implements WxUserVisitService {
}

@Override
public WxUserVisit getById(Long id) {
return wxUserVisitMapper.selectById(id);
public WxUserVisit getById(Long id, TenantEntity tenantEntity) {
WxUserVisit record = new WxUserVisit();
record.updateTenantInfo(tenantEntity);
record.setId(id);
return wxUserVisitMapper.selectOne(new QueryWrapper<>(record));
}

@Override
@@ -50,8 +57,11 @@ public class WxUserVisitServiceImpl implements WxUserVisitService {
}

@Override
public void deleteById(Long id) {
wxUserVisitMapper.deleteById(id);
public void deleteById(Long id, TenantEntity tenantEntity) {
WxUserVisit record = new WxUserVisit();
record.updateTenantInfo(tenantEntity);
record.setId(id);
wxUserVisitMapper.delete(new QueryWrapper<>(record));
}

@Override


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