xhxu 4 лет назад
Родитель
Сommit
f265f96b8d
5 измененных файлов: 38 добавлений и 5 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java
  2. +20
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  4. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java

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

@@ -519,7 +519,7 @@ public class WxUserStructureController extends BaseController {
List<WxUserChannel> channelStructureList = new ArrayList<>(); List<WxUserChannel> channelStructureList = new ArrayList<>();
List<WxUserChannel> senceStructureList = new ArrayList<>(); List<WxUserChannel> senceStructureList = new ArrayList<>();
TenantEntity tenantInfo = getTenantInfo(); TenantEntity tenantInfo = getTenantInfo();
wxCUser.updateTenantInfo(wxCUser);
wxCUser.updateTenantInfo(tenantInfo);
// List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(getTenantInfo()); // List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(getTenantInfo());


List<WxUserChannel> channels = wxUserChannelService.findDistinctChannel(); List<WxUserChannel> channels = wxUserChannelService.findDistinctChannel();


+ 20
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Просмотреть файл

@@ -5,12 +5,14 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxOrderReportDto; import com.iformall.domain.dto.WxOrderReportDto;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxMerchantMicroPayVo; import com.iformall.domain.vo.WxMerchantMicroPayVo;
import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumOrderStatus;
import com.iformall.enums.EnumOrderType; import com.iformall.enums.EnumOrderType;
import com.iformall.service.MarkingDataReportService; import com.iformall.service.MarkingDataReportService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +33,13 @@ public class WxMerchantMicroPayController extends BaseController {
@SystemControllerLog(description = "收银台-近30日刷卡列表") @SystemControllerLog(description = "收银台-近30日刷卡列表")
public ResultData listMonth() { public ResultData listMonth() {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth");
TenantEntity tenantEntity = getTenantInfo();
if(StringUtils.isBlank(tenantEntity.getTenantId())){
//todo 集团版查询数据待重构
return new ResultData("集团版查询数据待重构");
}
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(getTenantInfo());
wxOrderReportDto.updateTenantInfo(tenantEntity);
wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode());
wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto));
@@ -44,8 +51,13 @@ public class WxMerchantMicroPayController extends BaseController {
@SystemControllerLog(description = "收银台-近30日刷卡列表详情") @SystemControllerLog(description = "收银台-近30日刷卡列表详情")
public ResultData detail(@RequestParam Long merchantId) { public ResultData detail(@RequestParam Long merchantId) {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail");
TenantEntity tenantEntity = getTenantInfo();
if(StringUtils.isBlank(tenantEntity.getTenantId())){
//todo 集团版查询数据待重构
return new ResultData("集团版查询数据待重构");
}
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(getTenantInfo());
wxOrderReportDto.updateTenantInfo(tenantEntity);
wxOrderReportDto.setMerchantId(merchantId); wxOrderReportDto.setMerchantId(merchantId);
return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto));
} }
@@ -55,9 +67,14 @@ public class WxMerchantMicroPayController extends BaseController {
@SystemControllerLog(description = "收银台-获得昨日刷卡列表") @SystemControllerLog(description = "收银台-获得昨日刷卡列表")
public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday");
TenantEntity tenantEntity = getTenantInfo();
if(StringUtils.isBlank(tenantEntity.getTenantId())){
//todo 集团版查询数据待重构
return new ResultData("集团版查询数据待重构");
}
if (wxOrderReportDto == null) if (wxOrderReportDto == null)
wxOrderReportDto = new WxOrderReportDto(); wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.updateTenantInfo(getTenantInfo());
wxOrderReportDto.updateTenantInfo(tenantEntity);
final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


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

@@ -99,6 +99,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
//今日领取券数 //今日领取券数
//查询coupon order表 //查询coupon order表
WxCouponOrder wxCouponOrder = new WxCouponOrder(); WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.updateTenantInfo(tenantEntity);
wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setStartTime(addDay(0));
wxCouponOrder.setEndTime(addDay(1)); wxCouponOrder.setEndTime(addDay(1));
int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder); int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder);


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

@@ -13,6 +13,7 @@ import com.iformall.domain.vo.UserCountVo;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCUserMapper; import com.iformall.mapper.WxCUserMapper;
import com.iformall.mapper.WxMallMapper;
import com.iformall.mq.MqBaseProducer; import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -32,6 +33,9 @@ import java.util.List;
public class WxCUserServiceImpl implements WxCUserService { public class WxCUserServiceImpl implements WxCUserService {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
WxMallMapper wxMallMapper;

@Autowired @Autowired
WxCUserMapper wxCUserMapper; WxCUserMapper wxCUserMapper;


@@ -240,6 +244,16 @@ public class WxCUserServiceImpl implements WxCUserService {


@Override @Override
public long countByChannel(WxCUser user) { 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;
}
return wxCUserMapper.countByChannel(user); return wxCUserMapper.countByChannel(user);
} }




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

@@ -118,8 +118,9 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
for (TenantEntity te:tenantEntitys) { for (TenantEntity te:tenantEntitys) {
wxCouponActionLogMapper.updateCreateTimeMd(te.getTenantId()); wxCouponActionLogMapper.updateCreateTimeMd(te.getTenantId());
} }
}else{
wxCouponActionLogMapper.updateCreateTimeMd(tenantEntity.getTenantId());
} }
wxCouponActionLogMapper.updateCreateTimeMd(tenantEntity.getTenantId());
} }


@Override @Override


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