From f265f96b8d3fcbc5651cc4cd04b7011f633fa61b Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 24 Feb 2022 12:02:37 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatower/WxUserStructureController.java | 2 +- .../market/WxMerchantMicroPayController.java | 23 ++++++++++++++++--- .../impl/MarkingDataReportServiceImpl.java | 1 + .../service/impl/WxCUserServiceImpl.java | 14 +++++++++++ .../impl/WxCouponActionLogServiceImpl.java | 3 ++- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 2e9127255..a8dcf842d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -519,7 +519,7 @@ public class WxUserStructureController extends BaseController { List channelStructureList = new ArrayList<>(); List senceStructureList = new ArrayList<>(); TenantEntity tenantInfo = getTenantInfo(); - wxCUser.updateTenantInfo(wxCUser); + wxCUser.updateTenantInfo(tenantInfo); // List tenantEntitys = wxMallService.getTenantEntitys(getTenantInfo()); List channels = wxUserChannelService.findDistinctChannel(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 858f572bd..92eb76578 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/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.controller.base.BaseController; import com.iformall.domain.dto.WxOrderReportDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantMicroPayVo; import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumOrderType; import com.iformall.service.MarkingDataReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,8 +33,13 @@ public class WxMerchantMicroPayController extends BaseController { @SystemControllerLog(description = "收银台-近30日刷卡列表") public ResultData listMonth() { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); + TenantEntity tenantEntity = getTenantInfo(); + if(StringUtils.isBlank(tenantEntity.getTenantId())){ + //todo 集团版查询数据待重构 + return new ResultData("集团版查询数据待重构"); + } WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.updateTenantInfo(getTenantInfo()); + wxOrderReportDto.updateTenantInfo(tenantEntity); wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); @@ -44,8 +51,13 @@ public class WxMerchantMicroPayController extends BaseController { @SystemControllerLog(description = "收银台-近30日刷卡列表详情") public ResultData detail(@RequestParam Long merchantId) { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); + TenantEntity tenantEntity = getTenantInfo(); + if(StringUtils.isBlank(tenantEntity.getTenantId())){ + //todo 集团版查询数据待重构 + return new ResultData("集团版查询数据待重构"); + } WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.updateTenantInfo(getTenantInfo()); + wxOrderReportDto.updateTenantInfo(tenantEntity); wxOrderReportDto.setMerchantId(merchantId); return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); } @@ -55,9 +67,14 @@ public class WxMerchantMicroPayController extends BaseController { @SystemControllerLog(description = "收银台-获得昨日刷卡列表") public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); + TenantEntity tenantEntity = getTenantInfo(); + if(StringUtils.isBlank(tenantEntity.getTenantId())){ + //todo 集团版查询数据待重构 + return new ResultData("集团版查询数据待重构"); + } if (wxOrderReportDto == null) wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.updateTenantInfo(getTenantInfo()); + wxOrderReportDto.updateTenantInfo(tenantEntity); final PageInfo page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 0501ddbb1..680fcbf0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -99,6 +99,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 37304d5d4..4083880a3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/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.exception.MallinkException; import com.iformall.mapper.WxCUserMapper; +import com.iformall.mapper.WxMallMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.utils.Constant; @@ -32,6 +33,9 @@ import java.util.List; public class WxCUserServiceImpl implements WxCUserService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + WxMallMapper wxMallMapper; + @Autowired WxCUserMapper wxCUserMapper; @@ -240,6 +244,16 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public long countByChannel(WxCUser user) { + if(StringUtils.isBlank(user.getTenantId()) + && StringUtils.isNotBlank(user.getParentTenantId())){ + List tenantEntitys = wxMallMapper.getTenantEntitys(user); + long count = 0l; + for (TenantEntity te:tenantEntitys) { + user.updateTenantInfo(te); + count += wxCUserMapper.countByChannel(user); + } + return count; + } return wxCUserMapper.countByChannel(user); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index b7004de21..085383045 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -118,8 +118,9 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { for (TenantEntity te:tenantEntitys) { wxCouponActionLogMapper.updateCreateTimeMd(te.getTenantId()); } + }else{ + wxCouponActionLogMapper.updateCreateTimeMd(tenantEntity.getTenantId()); } - wxCouponActionLogMapper.updateCreateTimeMd(tenantEntity.getTenantId()); } @Override