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

/. 报表-001

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
cec3a3b508
13 измененных файлов: 113 добавлений и 169 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java
  2. +10
    -2
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +1
    -4
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  4. +7
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  5. +15
    -23
      mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
  6. +12
    -21
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  7. +21
    -40
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java
  8. +8
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  9. +8
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  10. +13
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  11. +9
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  12. +8
    -17
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  13. +1
    -7
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java Просмотреть файл

@@ -33,7 +33,6 @@ public class DataTowerController extends BaseController {
public ResultData queryRunningPotal() {
logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningPotal");
Map<String, Object> data = dataTowerService.queryRunningPotal(getTenantInfo());

return new ResultData(data);
}



+ 10
- 2
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -36,6 +36,7 @@ public enum ErrorCode{
*/
SYS_CONFIG_VIERFY_SECODES_UNSET(1030,"系统设置【券码刷新时间】未配置"),
SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET(1031,"系统配置【外部设备核销默认商户员工编号】未配置"),

/**
* 菜单
*/
@@ -46,6 +47,7 @@ public enum ErrorCode{
MENU_PARENT_NOT_MENU(1024, "上级菜单只能为菜单类型"),
MENU_SYS_NOT_DEL(1025, "系统菜单, 不能删除"),
MENU_CHILD_NOT_DEL(1026, "请先删除子菜单或按钮"),

/**
* 数据库
*/
@@ -109,6 +111,7 @@ public enum ErrorCode{
MERCHANT_BUSER_NOT_VALID(2016, "商户用户不存在或已被禁用"),
MERCHANT_HASRENTCONTRACT(2017,"该商户存在计租中合同"),
MERCHANT_CODE_IS_FOUND(2018, "商户编码已存在"),

/**
* 券
*/
@@ -150,6 +153,7 @@ public enum ErrorCode{
COUPON_IS_TAKE_OFF_GIFT(2122, "子券存在作废券"),
COUPON_VALID_DATE_ERR_GIFT(2135, "存在子券有效期在券包有效期之前"),
COUPON_GIFT_NOTUPD_INVENTORY(2136, "子券没有库存"),

/**
* 车流 2040
*/
@@ -366,6 +370,7 @@ public enum ErrorCode{
PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"),
PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"),
PROFIT_SHARING_TIME_EXPIRED(12042, "分账已过期"),

/**
* 核销
*/
@@ -416,6 +421,7 @@ public enum ErrorCode{
MSG_SUM_INSUFFICENT(12112,"短信数量不足"),
MSG_NO_VALID_PHONE(12113,"没有可以发送的用户"),
MSG_SEND_INTERFACE_ERROR(12114,"短信运营商返回错误"),

/**
* 会员
*/
@@ -441,6 +447,7 @@ public enum ErrorCode{
RENT_CONTRACT_IS_NOT_FOUND(15000,"租赁合同不存在"),
RENT_CONTRACT_IS_TERMINATED(15001,"租赁合同已终止"),
RENT_CONTRACT_WITH_SHOP_IS_FOUND(15002,"店铺存在已关联的合同"),

/**
* 物业合同
* */
@@ -454,13 +461,11 @@ public enum ErrorCode{
/**
* 租赁押金账单
* */

BILL_RENT_DEPOSIT_IS_NOT_FOUND(18000,"租赁押金账单不存在"),

/**
* 物业账单
* */

BILL_PROPERTY_IS_NOT_FOUND(19000,"物业账单不存在"),


@@ -478,6 +483,7 @@ public enum ErrorCode{
BILL_OWE_ZERO(21002,"账单欠缴为0"),
BILL_PAY_ERROR(21003,"账单支付错误"),
BILL_IS_FOUND(21004, "创建的账单已存在"),

/**
* 商铺
* */
@@ -500,6 +506,7 @@ public enum ErrorCode{
*/
FLOW_FAIL(24000, "审批流操作出错"),
FLOW_INST_NOT_EXIST(24001, "任务不存在"),

/**
* 微信第三方
*/
@@ -531,6 +538,7 @@ public enum ErrorCode{
DEVICE_REACHED_MAX_NUMBER(26003, "设备已经达到最大数量"),
DEVICE_HAS_BEEN_BOUND(26004, "设备已经绑定到其他商户"),
DEVICE_SIGN_INVALID(26005, "设备签名无效"),

/**
* 消息组件
*/


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

@@ -79,7 +79,7 @@ public class DataTowerServiceImpl implements DataTowerService {
StringRedisTemplate stringRedisTemplate;

@Autowired
private WxMallMapper wxMallMapper;
private WxMallService wxMallService;

@Autowired
private WxChartDataMapper wxChartDataMapper;
@@ -352,14 +352,11 @@ public class DataTowerServiceImpl implements DataTowerService {

HashMap<String, Object> dataMap = new HashMap<>();
dataMap.put("shop", shopRunning(tenantEntity));
// dataMap.put("rent", rentRunning(tenantEntity));
// dataMap.put("report", reportRunning(tenantEntity));
dataMap.put("car", carRunning(tenantEntity));
dataMap.put("coupon", couponRunning(tenantEntity));
dataMap.put("visitor", visitorRunning(tenantEntity));
dataMap.put("contract", contractRunning(tenantEntity));
dataMap.put("message", messageRunning(tenantEntity));
// dataMap.put("bill", billRunning(tenantEntity));
return dataMap;
}



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

@@ -34,7 +34,7 @@ public class WxCUserServiceImpl implements WxCUserService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;

@Autowired
WxCUserMapper wxCUserMapper;
@@ -244,17 +244,13 @@ public class WxCUserServiceImpl implements WxCUserService {

@Override
public long countByChannel(WxCUser user) {
if(StringUtils.isBlank(user.getTenantId())
&& StringUtils.isNotBlank(user.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(user);
long count = 0l;
for (TenantEntity te:tenantEntitys) {
user.updateTenantInfo(te);
count += wxCUserMapper.countByChannel(user);
}
return count;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(user);
long count = 0l;
for (TenantEntity te:tenantEntitys) {
user.updateTenantInfo(te);
count += wxCUserMapper.countByChannel(user);
}
return wxCUserMapper.countByChannel(user);
return count;
}

@Override


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

@@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.mapper.WxCarCmdLogMapper;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxCarCmdLogService;
import com.iformall.service.WxMallService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +28,7 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {
WxCarCmdLogMapper wxCarCmdLogMapper;

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;


@Override
@@ -79,29 +80,20 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {

@Override
public Map<String, Long> getHourCountMap(WxCarCmdLog wxCarCmdLog) {
if(StringUtils.isBlank(wxCarCmdLog.getTenantId())
&& StringUtils.isNotBlank(wxCarCmdLog.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxCarCmdLog);
Map<String, Long> map = new HashMap<>();
for (TenantEntity tenantEntity:tenantEntitys) {
wxCarCmdLog.updateTenantInfo(tenantEntity);
List<Map<String, Object>> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog);
Map<String, Long> collect = list.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return (Long)m.get("carcount");
}));
collect.forEach((key,value) -> map.merge(key,value,Long::sum));
}
return map;

List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(wxCarCmdLog);
Map<String, Long> map = new HashMap<>();
for (TenantEntity tenantEntity:tenantEntitys) {
wxCarCmdLog.updateTenantInfo(tenantEntity);
List<Map<String, Object>> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog);
Map<String, Long> collect = list.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return (Long)m.get("carcount");
}));
collect.forEach((key,value) -> map.merge(key,value,Long::sum));
}
List<Map<String, Object>> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog);
Map<String, Long> collect = list.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return (Long)m.get("carcount");
}));
return collect;
return map;
}

@Override


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

@@ -41,7 +41,7 @@ public class WxChartServiceImpl implements WxChartDataService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxMallMapper wxMallMapper;
private WxMallService wxMallService;
@Autowired
WxShopMapper wxShopMapper;
@Autowired
@@ -1208,7 +1208,7 @@ public class WxChartServiceImpl implements WxChartDataService {
String startdate;
String enddate;
HashMap<String, Object> datamap = new HashMap<>();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
HashMap<String, Object> params = new HashMap<>();
params.put("tenantEntitys", tenantEntitys);
params.put("tenantId", tenantEntity.getTenantId());
@@ -1322,7 +1322,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getNewUserCount(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(tenantEntity);
@@ -1390,11 +1389,10 @@ public class WxChartServiceImpl implements WxChartDataService {
Date endTime = c.getTime();//明天0点
c.add(Calendar.DAY_OF_YEAR, -30);
Date startTime = c.getTime();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.setStartTime(startTime);
wxCouponOrder.setEndTime(endTime);
// wxCouponOrder.updateTenantInfo(tenantEntity);
int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys);//月消费金额
c.clear();
c.add(Calendar.DAY_OF_YEAR, -1);
@@ -1414,7 +1412,6 @@ public class WxChartServiceImpl implements WxChartDataService {
}

private ResultData getNewMemberCount(TenantEntity tenantEntity, int days, String returnName) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(tenantEntity);
@@ -1517,7 +1514,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date eTime = c.getTime();
c.add(Calendar.DAY_OF_YEAR, -7);
Date sTime = c.getTime();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) {
@@ -1559,7 +1556,7 @@ public class WxChartServiceImpl implements WxChartDataService {
c.set(Calendar.SECOND, 0);
Date eTime = c.getTime();//明天0点
c.add(Calendar.DAY_OF_YEAR, -30);//三十天前
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额
Map<String, Integer> dataMap = new HashMap<>();
@@ -1698,7 +1695,7 @@ public class WxChartServiceImpl implements WxChartDataService {
Date eTime = c.getTime();//明天0点
c.add(Calendar.DAY_OF_YEAR, -30);//三十天前
Date sTime = c.getTime();
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime);
Map<String, Integer> dataMap = new HashMap<>();
for (CUserDateAmountVo v : datas) {
@@ -1731,7 +1728,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getMemeberWechatTotal(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(tenantEntity);
@@ -1779,7 +1775,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getMemberWechatJoinTrade(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
final int daysBefore = 29;
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
@@ -1837,7 +1832,7 @@ public class WxChartServiceImpl implements WxChartDataService {
String startdate;
String enddate;
HashMap<String, Object> datamap = new HashMap<>();
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
// List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
// //couponData
// HashMap<String, Object> params = new HashMap<>();
// params.put("tenantEntitys",tenantEntitys);
@@ -1934,7 +1929,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getFromChannelAnalysis(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
List<WxUserChannel> channelStructureList = new ArrayList<>();
WxCUser wxCUser = new WxCUser();
@@ -1969,7 +1963,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getWechatMemberTrade(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
final int daysBefore = 29;
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
@@ -2042,7 +2035,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSceneAnalysis(TenantEntity tenantEntity) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
HashMap<String, Object> datamap = new HashMap<>();
List<WxUserChannel> senceStructureList = new ArrayList<>();
WxCUser wxCUser = new WxCUser();
@@ -2105,7 +2097,6 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getMemberBindCar(TenantEntity tenantEntity, String startdate, String enddate) {
// List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
dto.updateTenantInfo(tenantEntity);
dto.setStartTime(DateUtils.stringToDate(startdate));
@@ -2282,7 +2273,7 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSaleCardAnalysis(TenantEntity tenantEntity,Map<String, String> paramsMap, String startdate, String enddate) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
WxCoupon wxCoupon = new WxCoupon();

//默认时间本月第一天,截止到当天
@@ -2329,7 +2320,7 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSaleCouponAnalysis(TenantEntity tenantEntity, Map<String, String> paramsMap, String startdate, String enddate) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
WxCoupon wxCoupon = new WxCoupon();
Map<String,Object> result = new HashedMap();

@@ -2396,7 +2387,7 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSalePressAnalysis(Map<String, String> paramsMap, TenantEntity tenantEntity, String startdate, String enddate) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
WxCoupon wxCoupon = new WxCoupon();
Map<String,Object> result = new HashedMap();

@@ -2461,7 +2452,7 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSaleGroupAnalysis(Map<String, String> paramsMap, TenantEntity tenantEntity, String startdate) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Map<String, Object> params = new HashMap<>();
params.put("tenantEntitys",tenantEntitys);
params.put("tenantId", tenantEntity.getTenantId());
@@ -2956,7 +2947,7 @@ public class WxChartServiceImpl implements WxChartDataService {
* @return
*/
private ResultData getSaleDataHistory(TenantEntity tenantEntity, String startdate,String enddate) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Date startDate = DateUtils.getDateFromString(startdate,"yyyy-MM-dd HH:mm:ss").getTime();
Date endDate = DateUtils.getDateFromString(enddate,"yyyy-MM-dd HH:mm:ss").getTime();



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

@@ -17,9 +17,8 @@ import com.iformall.domain.vo.MarkingSceneDataVo;
import com.iformall.domain.vo.WxCouponActionLogVo;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponActionLogMapper;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxCouponActionLogService;
import org.apache.commons.lang3.StringUtils;
import com.iformall.service.WxMallService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +34,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
WxCouponActionLogMapper wxCouponActionLogMapper;

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;


@Override
@@ -98,54 +97,36 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {

@Override
public int getCountByDateLimit(TenantEntity tenantEntity, Date startTime, Date endTime) {
if(StringUtils.isBlank(tenantEntity.getTenantId())
&& StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
int count = 0;
for (TenantEntity te:tenantEntitys) {
count += wxCouponActionLogMapper.getCountByDateLimit(te.getTenantId(),startTime,endTime);
}
return count;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
int count = 0;
for (TenantEntity te:tenantEntitys) {
count += wxCouponActionLogMapper.getCountByDateLimit(te.getTenantId(),startTime,endTime);
}
return wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(),startTime,endTime);
return count;
}

@Override
public void updateCreateTimeMd(TenantEntity tenantEntity) {
if(StringUtils.isBlank(tenantEntity.getTenantId())
&& StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
for (TenantEntity te:tenantEntitys) {
wxCouponActionLogMapper.updateCreateTimeMd(te.getTenantId());
}
}else{
wxCouponActionLogMapper.updateCreateTimeMd(tenantEntity.getTenantId());
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
for (TenantEntity te:tenantEntitys) {
wxCouponActionLogMapper.updateCreateTimeMd(te.getTenantId());
}
}

@Override
public Map<String, Integer> getSceneDataMap(TenantEntity tenantEntity, Date startTime, Date endTime) {
if(StringUtils.isBlank(tenantEntity.getTenantId())
&& StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
Map<String, Integer> map = new HashMap<>();
for (TenantEntity te:tenantEntitys) {
List<MarkingSceneDataReportTVo> sceneDataMap = wxCouponActionLogMapper.getSceneDataMap(te.getTenantId(), startTime, endTime);
Map<String, Integer> collect = sceneDataMap.stream().collect(Collectors.toMap(m -> {
return m.getXTime()+"_"+m.getChannelType();
}, m -> {
return m.getCount();
}));
collect.forEach((key,value) -> map.merge(key,value,Integer::sum));
}
return map;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
Map<String, Integer> map = new HashMap<>();
for (TenantEntity te:tenantEntitys) {
List<MarkingSceneDataReportTVo> sceneDataMap = wxCouponActionLogMapper.getSceneDataMap(te.getTenantId(), startTime, endTime);
Map<String, Integer> collect = sceneDataMap.stream().collect(Collectors.toMap(m -> {
return m.getXTime()+"_"+m.getChannelType();
}, m -> {
return m.getCount();
}));
collect.forEach((key,value) -> map.merge(key,value,Integer::sum));
}
List<MarkingSceneDataReportTVo> sceneDataMap = wxCouponActionLogMapper.getSceneDataMap(tenantEntity.getTenantId(), startTime, endTime);
return sceneDataMap.stream().collect(Collectors.toMap(m -> {
return m.getXTime()+"_"+m.getChannelType();
}, m -> {
return m.getCount();
}));
return map;
}

@Override


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

@@ -74,7 +74,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
@Autowired
WxFloatingLayerMapper wxFloatingLayerMapper;
@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;

@Autowired
@Qualifier("couponChannelRedisTemplate")
@@ -203,7 +203,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
@Override
public ResultData addBatch(String type,String[] ids, String[] channelId, TenantEntity tenantEntity, Date showBeginTime, Date beginTime, Date endTime) {
//如果当前版本是推广版,则线上只能有一个拼团,一个砍价
WxMall mall = wxMallMapper.getByTenantId(tenantEntity.getTenantId());
WxMall mall = wxMallService.getByTenantId(tenantEntity.getTenantId());
if (mall.getSaleType().intValue() == 4 ) {
if (null != type && (type.equals(String.valueOf(EnumCouponType.COUPON_PRESS.getCode().intValue()))
|| type.equals(String.valueOf(EnumCouponType.COUPON_GROUP.getCode().intValue()))
@@ -302,17 +302,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {

@Override
public int countCoupon(WxCouponChannel wxCouponChannel) {
if(StringUtils.isBlank(wxCouponChannel.getTenantId())
&& StringUtils.isNotBlank(wxCouponChannel.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxCouponChannel);
int count = 0;
for (TenantEntity tenantEntity:tenantEntitys) {
wxCouponChannel.updateTenantInfo(tenantEntity);
count += wxCouponChannelMapper.countCoupon(wxCouponChannel);
}
return count;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(wxCouponChannel);
int count = 0;
for (TenantEntity tenantEntity:tenantEntitys) {
wxCouponChannel.updateTenantInfo(tenantEntity);
count += wxCouponChannelMapper.countCoupon(wxCouponChannel);
}
return wxCouponChannelMapper.countCoupon(wxCouponChannel);
return count;
}

/**


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

@@ -102,7 +102,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
WxPayOrderMapper wxPayOrderMapper;

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;

@Autowired
WxTemplateMsgMapper wxTemplateMsgMapper;
@@ -2153,7 +2153,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
public List<CUserDateAmountVo> queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime) {
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity);
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), startTime, endTime);
}

@@ -2748,17 +2748,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

public int findCount(WxCouponOrder wxCouponOrder){
if(StringUtils.isBlank(wxCouponOrder.getTenantId())
&& StringUtils.isNotBlank(wxCouponOrder.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxCouponOrder);
int count = 0;
for (TenantEntity tenantEntity:tenantEntitys) {
wxCouponOrder.updateTenantInfo(tenantEntity);
count += wxCouponOrderMapper.findCount(wxCouponOrder);
}
return count;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(wxCouponOrder);
int count = 0;
for (TenantEntity tenantEntity:tenantEntitys) {
wxCouponOrder.updateTenantInfo(tenantEntity);
count += wxCouponOrderMapper.findCount(wxCouponOrder);
}
return wxCouponOrderMapper.findCount(wxCouponOrder);
return count;
}

@Override


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

@@ -8,6 +8,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumGroupSupport;
import com.iformall.enums.EnumInvestUserType;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.enums.EnumUserAdmin;
@@ -31,10 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@@ -252,13 +250,22 @@ public class WxMallServiceImpl implements WxMallService {
}

/**
* 根据parentTenantId获取子广场列表
* 集团则获取子广场列表
* 广场则直接返回
* @param tenantEntity
* @return
*/
@Override
public List<TenantEntity> getTenantEntitys(TenantEntity tenantEntity) {
return wxMallMapper.getTenantEntitys(tenantEntity);
WxMall mall = this.getByTenantId(tenantEntity.getTenantId());
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) &&
StringUtils.isBlank(mall.getParentTenantId())) {
return wxMallMapper.getTenantEntitys(tenantEntity);
}else{
List<TenantEntity> list = new ArrayList<>();
list.add(tenantEntity);
return list;
}
}

private void deleteRedis(TenantEntity tenantEntity){


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

@@ -84,7 +84,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxBusinessMapper wxBusinessMapper;

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;

@Autowired
WxBrandMapper WxBrandMapper;
@@ -212,7 +212,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//商场信息
WxMall wxMall = new WxMall();
wxMall.setTenantInfo(wxRentContract);
List<WxMall> mallList = wxMallMapper.findList(wxMall);
List<WxMall> mallList = wxMallService.findList(wxMall);
if (!mallList.isEmpty()) {
result.put("mall", mallList.get(0));
}
@@ -1958,7 +1958,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//MALL信息
WxMall wxMall = new WxMall();
wxMall.setTenantInfo(wxRentContract);
wxMall = wxMallMapper.findList(wxMall).get(0);
wxMall = wxMallService.findList(wxMall).get(0);
result.put("mallName", wxMall.getName());
result.put("province", wxMall.getProvince());
result.put("city", wxMall.getCity());
@@ -3249,17 +3249,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {

@Override
public long findCount(WxRentContract wxRentContract) {
if(StringUtils.isBlank(wxRentContract.getTenantId())
&& StringUtils.isNotBlank(wxRentContract.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxRentContract);
long count = 0l;
for (TenantEntity tenantEntity:tenantEntitys) {
wxRentContract.updateTenantInfo(tenantEntity);
count += wxRentContractMapper.findCount(wxRentContract);
}
return count;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(wxRentContract);
long count = 0l;
for (TenantEntity tenantEntity:tenantEntitys) {
wxRentContract.updateTenantInfo(tenantEntity);
count += wxRentContractMapper.findCount(wxRentContract);
}
return wxRentContractMapper.findCount(wxRentContract);
return count;
}




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

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.iformall.mapper.*;
import com.iformall.service.*;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -43,19 +44,13 @@ import com.iformall.enums.EnumRentContractStatus;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumShopStatus;
import com.iformall.enums.EnumUserAdmin;
import com.iformall.service.ExcelService;
import com.iformall.service.WxBrandService;
import com.iformall.service.WxBusinessService;
import com.iformall.service.WxMallBuildingService;
import com.iformall.service.WxMallFloorService;
import com.iformall.service.WxShopService;

@Service
public class WxShopServiceImpl implements WxShopService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
WxMallMapper wxMallMapper;
WxMallService wxMallService;
@Autowired
WxShopMapper wxShopMapper;
@@ -174,17 +169,13 @@ public class WxShopServiceImpl implements WxShopService {

@Override
public long findCount(WxShop wxShop) {
if(StringUtils.isBlank(wxShop.getTenantId())
&& StringUtils.isNotBlank(wxShop.getParentTenantId())){
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(wxShop);
long count = 0l;
for (TenantEntity tenantEntity:tenantEntitys) {
wxShop.updateTenantInfo(tenantEntity);
count += wxShopMapper.findCount(wxShop);
}
return count;
long count = 0l;
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(wxShop);
for (TenantEntity tenantEntity:tenantEntitys) {
wxShop.updateTenantInfo(tenantEntity);
count += wxShopMapper.findCount(wxShop);
}
return wxShopMapper.findCount(wxShop);
return count;
}

private Map<Long,WxMerchant> getMerchantMap(TenantEntity tenantEntity,List<Long> merchantIds,Map<Long,WxMerchant> merchantMap) {


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

@@ -221,13 +221,7 @@


<select id="getTenantEntitys" parameterType="com.iformall.domain.po.base.TenantEntity" resultType="com.iformall.domain.po.base.TenantEntity">
select `tenant_id`,`parent_tenant_id` from wx_mall where 1=1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
select `tenant_id`,`parent_tenant_id` from wx_mall where `parent_tenant_id` = #{tenantId}
</select>

<select id="findListAadmin" parameterType="com.iformall.domain.po.WxMall" resultMap="BaseResultMap">


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