From 15c32136eee8c38d98f8975ae144bd4a1d9a83cb Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 27 Oct 2020 13:45:51 +0800 Subject: [PATCH] bug --- .../datatower/WxUserStructureController.java | 5 +- .../controller/market/WxCouponController.java | 17 +- .../market/WxOrderGroupController.java | 12 +- .../controller/WxCouponController.java | 22 +- .../controller/WxOrderGroupController.java | 12 +- .../iformall/schedule/ChartDataSchedule.java | 6 +- .../com/iformall/mapper/WxCouponMapper.java | 6 +- .../iformall/mapper/WxOrderGroupMapper.java | 2 +- .../iformall/service/WxCUserCarService.java | 3 +- .../com/iformall/service/WxCouponService.java | 9 +- .../iformall/service/WxOrderGroupService.java | 3 +- .../service/impl/DataTowerServiceImpl.java | 6 +- .../service/impl/WxCUserCarServiceImpl.java | 11 +- .../service/impl/WxChartServiceImpl.java | 20 +- .../service/impl/WxCouponServiceImpl.java | 12 +- .../service/impl/WxOrderGroupServiceImpl.java | 5 +- .../main/resources/mapper/WxCouponMapper.xml | 188 +++++++++++------- .../resources/mapper/WxOrderGroupMapper.xml | 46 +++-- 18 files changed, 243 insertions(+), 142 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 08f064412..5b6474cd1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -156,14 +156,15 @@ public class WxUserStructureController extends BaseController { public ResultData findCarLevelStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findCarLevelStructure"); TenantEntity tenantInfo = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); +// List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoService.findCount(ifParentUpdateTenantInfo(),dto); dto.updateTenantInfo(tenantInfo); + dto.setFinalTenantId(tenantInfo.getFinalTenantId()); - long userCountWithCar = wxCUserCarService.countUser(dto,tenantEntitys); + long userCountWithCar = wxCUserCarService.countUser(dto); Map userWithCar = new HashMap(); userWithCar.put("title","已绑定车牌"); userWithCar.put("count",userCountWithCar); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 4ea10b5d9..e53381082 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -16,6 +16,7 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponPasswordService; import com.iformall.service.WxCouponService; import com.iformall.service.WxFlowService; +import com.iformall.service.WxMallService; import com.iformall.utils.DateUtils; import com.iformall.utils.RedisLock; @@ -50,6 +51,8 @@ public class WxCouponController extends BaseController { @Autowired private WxFlowService wxFlowService; @Autowired + private WxMallService wxMallService; + @Autowired RedisLock redisLock; @ApiOperation("分页列表接口") @@ -312,6 +315,8 @@ public class WxCouponController extends BaseController { public ResultData findCardCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { //默认时间本月第一天,截止到当天 Map result = new HashedMap(); + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); if (wxCoupon.getStartdate() == null) { wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } @@ -319,7 +324,7 @@ public class WxCouponController extends BaseController { wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - PageInfo pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize); + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSaleAmount() == null) { coupon.setSaleAmount(0); @@ -343,6 +348,8 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-券营销列表") public ResultData findCouponCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { //默认时间本月第一天,截止到当天 + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); Map result = new HashedMap(); if (wxCoupon.getStartdate() == null) { wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); @@ -353,7 +360,7 @@ public class WxCouponController extends BaseController { wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize); + PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSumSubsidy() == null) { coupon.setSumSubsidy(0); @@ -372,10 +379,12 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-砍价营销列表") public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); Map result = new HashedMap(); - wxCoupon.updateTenantInfo(getTenantInfo()); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); + PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); return new ResultData(pages); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 2d22efff8..626531b9c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; +import com.iformall.service.WxMallService; import com.iformall.service.WxOrderGroupService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/orderGroup") @Api(description = "拼团相关接口") @@ -26,6 +30,8 @@ public class WxOrderGroupController extends BaseController { @Autowired WxOrderGroupService wxOrderGroupService; + @Autowired + WxMallService wxMallService; @ApiOperation(value = "拼团营销分析") @GetMapping("queryOrderGroupMarketingList") @@ -36,8 +42,10 @@ public class WxOrderGroupController extends BaseController { }) @SystemControllerLog(description = "订单管理-拼团营销分析") public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { - wxOrderGroupMarketing.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + wxOrderGroupMarketing.updateTenantInfo(tenantEntity); + final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 6fbdc10f2..708ade309 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -16,10 +16,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; import com.iformall.mapper.WxCouponChannelMapper; -import com.iformall.service.WxCouponPasswordService; -import com.iformall.service.WxCouponService; -import com.iformall.service.WxFlowService; -import com.iformall.service.WxMerchantService; +import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.RedisLock; import io.swagger.annotations.Api; @@ -55,6 +52,8 @@ public class WxCouponController extends BaseController { @Autowired private WxMerchantService wxMerchantService; @Autowired + private WxMallService wxMallService; + @Autowired RedisLock redisLock; @ApiOperation("分页列表接口") @@ -350,6 +349,8 @@ public class WxCouponController extends BaseController { public ResultData findCardCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { //默认时间本月第一天,截止到当天 Map result = new HashedMap(); + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); if (wxCoupon.getStartdate() == null) { wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); } @@ -357,7 +358,7 @@ public class WxCouponController extends BaseController { wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - PageInfo pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize); + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon, tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSaleAmount() == null) { coupon.setSaleAmount(0); @@ -380,6 +381,9 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { //默认时间本月第一天,截止到当天 + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + Map result = new HashedMap(); if (wxCoupon.getStartdate() == null) { wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); @@ -390,7 +394,7 @@ public class WxCouponController extends BaseController { wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize); + PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon,tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSumSubsidy() == null) { coupon.setSumSubsidy(0); @@ -408,10 +412,12 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); Map result = new HashedMap(); - wxCoupon.updateTenantInfo(getTenantInfo()); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); + PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); return new ResultData(pages); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index 4e574d96a..2de764783 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -4,12 +4,13 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.enums.EnumOrderStatus; import com.iformall.service.WxCouponService; +import com.iformall.service.WxMallService; import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderService; import io.swagger.annotations.Api; @@ -21,6 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @RestController @@ -38,6 +40,9 @@ public class WxOrderGroupController extends BaseController { @Autowired WxOrderGroupService wxOrderGroupService; + @Autowired + WxMallService wxMallService; + @ApiOperation(value = "查询差1个的团购信息") @GetMapping("queryRemainOne") @@ -151,7 +156,10 @@ public class WxOrderGroupController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { - final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); + TenantEntity tenantEntity = getTenantInfo(); + List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); + wxOrderGroupMarketing.updateTenantInfo(tenantEntity); + final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, tenantEntitys, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index b55c7ae53..a68488ec7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -208,16 +208,18 @@ public class ChartDataSchedule { } public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) { - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); +// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoDto.setStartTime(date); wxCUserBasicInfoDto.setEndTime(date); - Integer carUserCount = wxCUserCarService.countUser(wxCUserBasicInfoDto,tenantEntitys); + Integer carUserCount = wxCUserCarService.countUser(wxCUserBasicInfoDto); addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); } public void carMemberData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { + params.put("finalTenantId",tenantEntity.getFinalTenantId()); List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params); Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count"); addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 9fd66f379..7ab9e250d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param; import com.iformall.domain.po.WxCoupon; public interface WxCouponMapper extends CommonMapper { - List findPressData(WxCoupon wxCoupon); - List findCouponData(WxCoupon wxCoupon); - List findCountData(WxCoupon wxCoupon); + List findPressData(@Param("tenantEntitys")List tenantEntitys, @Param("wxCoupon")WxCoupon wxCoupon); + List findCouponData(@Param("tenantEntitys")List tenantEntitys, @Param("wxCoupon")WxCoupon wxCoupon); + List findCountData(@Param("tenantEntitys")List tenantEntitys, @Param("wxCoupon")WxCoupon wxCoupon); List findList(WxCoupon wxCoupon); List findCouponList(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java index e7cac8714..6d01e9965 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java @@ -26,7 +26,7 @@ public interface WxOrderGroupMapper extends CommonMapper { int updateOrderGroup(WxOrderGroup wxOrderGroup); - List queryOrderGroupMarketingList(WxOrderGroupMarketing marketing); + List queryOrderGroupMarketingList(@Param("tenantEntitys")List tenantEntitys, @Param("marketing")WxOrderGroupMarketing marketing); List> queryOrderGroupSuccessCountAndTime(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java index 16af06453..8749e43c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java @@ -39,10 +39,9 @@ public interface WxCUserCarService { * 根据实体查询count * * @param dto - * @param tenantEntitys * @return */ - Integer countUser(WxCUserBasicInfoDto dto, List tenantEntitys); + Integer countUser(WxCUserBasicInfoDto dto); /** * 根据实体查询 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 39ac3eee8..c604721f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -26,25 +26,28 @@ public interface WxCouponService { /** * 卡类列表,包括统计 * @param record + * @param tenantEntitys * @return */ - PageInfo findCountData(WxCoupon record, Integer pageNum, Integer pageSize); + PageInfo findCountData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize); /** * 券列表,包括统计 * @param record + * @param tenantEntitys * @return */ - PageInfo findCouponData(WxCoupon record,Integer pageNum, Integer pageSize); + PageInfo findCouponData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize); /** * 砍价列表,包括统计 * @param record + * @param tenantEntitys * @param pageNum * @param pageSize * @return */ - PageInfo findPressData(WxCoupon record,Integer pageNum, Integer pageSize); + PageInfo findPressData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java index ee3314651..17655f26b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; import java.util.List; @@ -31,6 +32,6 @@ public interface WxOrderGroupService { List findList(WxOrderGroup group); - PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, Integer pageNum, Integer pageSize); + PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, List tenantEntitys, Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index e955c0681..f23aa21e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -618,19 +618,21 @@ public class DataTowerServiceImpl implements DataTowerService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); try { wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate+ " 00:00:00")); wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate+ " 23:59:59")); }catch (Exception e){ e.printStackTrace(); } - datamap.put("oneWeekNewCarUserCount",wxCUserCarService.countUser(wxCUserBasicInfoDto,tenantEntitys)); + datamap.put("oneWeekNewCarUserCount",wxCUserCarService.countUser(wxCUserBasicInfoDto)); logger.info("停车-近一周新增停车会员数-结束"); //停车会员总数 logger.info("停车-停车会员总数-开始"); wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); - datamap.put("newCarUserSumCount",wxCUserCarService.countUser(wxCUserBasicInfoDto,tenantEntitys)); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); + datamap.put("newCarUserSumCount",wxCUserCarService.countUser(wxCUserBasicInfoDto)); logger.info("停车-停车会员总数-结束"); // 查询近一周的缴费车辆----end------ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index d6c711204..a33ef6c3b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -40,14 +40,9 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { } @Override - public Integer countUser(WxCUserBasicInfoDto dto, List tenantEntitys) { - int i = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); - Integer integer = wxCUserCarMapper.countUser(dto); - i += (integer==null?0:integer); - } - return i; + public Integer countUser(WxCUserBasicInfoDto dto) { + Integer integer = wxCUserCarMapper.countUser(dto); + return integer==null?0:integer; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index bc8c38bfb..a96c1a59d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -127,10 +127,9 @@ public class WxChartServiceImpl implements WxChartDataService { enddate = enddate + " 23:59:59"; } - TenantEntity tenantEntity = new TenantEntity() {{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); //出租率 if (chart.equals(EnumChart.CZL.getCode())) { @@ -1033,18 +1032,20 @@ public class WxChartServiceImpl implements WxChartDataService { String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); -// wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); try { wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate)); wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate)); } catch (Exception e) { e.printStackTrace(); } - datamap.put("oneWeekNewCarUserCount", wxCUserCarService.countUser(wxCUserBasicInfoDto,tenantEntitys)); + datamap.put("oneWeekNewCarUserCount", wxCUserCarService.countUser(wxCUserBasicInfoDto)); //停车会员总数 wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); -// wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); - datamap.put("newCarUserSumCount", wxCUserCarService.countUser(wxCUserBasicInfoDto,tenantEntitys)); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); + datamap.put("newCarUserSumCount", wxCUserCarService.countUser(wxCUserBasicInfoDto)); return new ResultData(datamap); } @@ -2140,7 +2141,8 @@ public class WxChartServiceImpl implements WxChartDataService { dto.setEndTime(DateUtils.stringToDate(enddate)); long total = wxCUserBasicInfoService.findCount(tenantEntity,dto); dto.updateTenantInfo(tenantEntity); - long userCountWithCar = wxCUserCarService.countUser(dto,tenantEntitys); + dto.setFinalTenantId(tenantEntity.getFinalTenantId()); + long userCountWithCar = wxCUserCarService.countUser(dto); Map userWithCar = new HashMap(); userWithCar.put("title", "已绑定车牌"); userWithCar.put("count", userCountWithCar); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 7d77567f7..20ad27273 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -173,8 +173,8 @@ public class WxCouponServiceImpl implements WxCouponService { @Override - public PageInfo findCountData(WxCoupon record,Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCountData(record)); + public PageInfo findCountData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCountData(tenantEntitys,record)); } @Override @@ -542,8 +542,8 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public PageInfo findCouponData(WxCoupon record, Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCouponData(record)); + public PageInfo findCouponData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCouponData(tenantEntitys,record)); } @Override @@ -609,8 +609,8 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public PageInfo findPressData(WxCoupon record, Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findPressData(record)); + public PageInfo findPressData(WxCoupon record, List tenantEntitys, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findPressData(tenantEntitys,record)); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index e770ba457..29f584427 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -405,9 +406,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { } @Override - public PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, Integer pageIndex, Integer pageSize) { + public PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, List tenantEntitys, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); - List result = wxOrderGroupMapper.queryOrderGroupMarketingList(marketing); + List result = wxOrderGroupMapper.queryOrderGroupMarketingList(tenantEntitys,marketing); PageInfo pageInfo = new PageInfo<>(result); return pageInfo; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index f3b67c91c..97676da30 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -746,141 +746,191 @@ where c.type = 100 and sc.create_date between #{startdate} and #{enddate} - select c.*, IFNULL(round((select sum(wcs.real_payment) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id left join wx_card_spend wcs on wcs.card_id = ci.id where wc.id = c.id)/(select sum(ci.sale_amount) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id where wc.id = c.id)*100,2),0) payment_rate, - (select count(wco.id) from wx_coupon wc - left join wx_coupon_order wco on wc.id = wco.coupon_id + (select count(wco.id) from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc + left join ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco on wc.id = wco.coupon_id where wc.id = c.id) as sale_count, (select count(distinct wcs.coupon_order_id) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id left join wx_card_transfer_info wcs on wcs.coupon_order_id = ci.id where wc.id = c.id) as transfer_count, (select sum(ci.sale_amount) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id where wc.id = c.id) as sale_amount, (select sum(wcs.real_payment) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id left join wx_card_spend wcs on wcs.card_id = ci.id where wc.id = c.id) as sum_payment, (select sum(sc.subsidy) from wx_card_info ci - left join wx_coupon wc on wc.id = ci.coupon_id + left join ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc on wc.id = ci.coupon_id left join wx_merchant_subsidy sc on sc.coupon_order_id = ci.id where wc.id = c.id) as sum_subsidy - from wx_coupon c where c.type = 100 - - and c.title like concat('%', #{title},'%') + from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) c where c.type = 100 + + and c.title like concat('%', #{wxCoupon.title},'%') - - and c.id = #{id} + + and c.id = #{wxCoupon.id} - order by ${sortColumns} - order by c.status asc,c.create_date desc + order by ${wxCoupon.sortColumns} + order by c.status asc,c.create_date desc - select c.*, - IFNULL(round((select count(wco.id) from wx_coupon wc,wx_coupon_order wco where wco.coupon_id = wc.id and - wco.coupon_order_status = 1 and wc.id = c.id)/(select count(wco.id) from wx_coupon_order wco where wco.coupon_id + IFNULL(round((select count(wco.id) from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc,( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco where wco.coupon_id = wc.id and + wco.coupon_order_status = 1 and wc.id = c.id)/(select count(wco.id) from ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco where wco.coupon_id = c.id)*100,2),0) payment_rate, - (select count(wco.id) from wx_coupon_order wco where wco.coupon_id = c.id) as sale_count, - (select count(wco.id) from wx_coupon wc,wx_coupon_order wco where wco.coupon_id = wc.id and + (select count(wco.id) from ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco where wco.coupon_id = c.id) as sale_count, + (select count(wco.id) from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc,( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco where wco.coupon_id = wc.id and wco.coupon_order_status = 1 and wc.id = c.id) as sum_payment, - (select count(wco.id) from wx_coupon wc,wx_coupon_order wco where wco.coupon_id = wc.id and + (select count(wco.id) from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc,( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wco where wco.coupon_id = wc.id and wco.coupon_order_status = 3 and wc.id = c.id) as backpay_count, - (select sum(sc.subsidy) from wx_coupon wc - left join wx_coupon_order wo on wo.coupon_id = wc.id + (select sum(sc.subsidy) from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc + left join ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wo on wo.coupon_id = wc.id left join wx_merchant_subsidy sc on sc.coupon_order_id = wo.id where wc.id = c.id) as sum_subsidy - from wx_coupon c where c.type not in(8,9,100) - + from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) c where c.type not in(8,9,100) + and c.sale_price > 0 - + and c.sale_price = 0 - - and c.title like concat('%', #{title},'%') + + and c.title like concat('%', #{wxCoupon.title},'%') - - and c.id = #{id} + + and c.id = #{wxCoupon.id} - order by ${sortColumns} - order by c.status asc,c.create_date desc + order by ${wxCoupon.sortColumns} + order by c.status asc,c.create_date desc - select c.id,c.tenant_id, c.`cover_img`,c.`title`,c.`sale_price`,c.`price`, ifnull(op.press_count,0) as press_count, ifnull(o.press_succ_count,0) as press_succ_count, ifnull(op2.join_count,0) as join_count, ifnull(round(o.press_succ_count/op.press_count*100,2),0) as change_rate, ifnull(round(cop.xCount/op.press_count*100,2),0) as payment_rate - FROM wx_coupon c - left join (SELECT count(id) as press_count, coupon_id FROM wx_order_press WHERE `first` = 1 - - and `tenant_id` = #{tenantId} + FROM ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) c + left join (SELECT count(id) as press_count, coupon_id FROM ( + SELECT * from wx_order_press${tenantEntity.shardTableSuffix} + ) wx_order_press WHERE `first` = 1 + + and `tenant_id` = #{wxCoupon.tenantId} - - and `parent_tenant_id` = #{parentTenantId} + + and `parent_tenant_id` = #{wxCoupon.parentTenantId} group by coupon_id) op on op.coupon_id = c.id - left join (SELECT count(id) as press_succ_count, product_id FROM wx_order WHERE order_status = 1 - - and `tenant_id` = #{tenantId} + left join (SELECT count(id) as press_succ_count, product_id FROM ( + SELECT * from wx_order${tenantEntity.shardTableSuffix} + ) wx_order WHERE order_status = 1 + + and `tenant_id` = #{wxCoupon.tenantId} - - and `parent_tenant_id` = #{parentTenantId} + + and `parent_tenant_id` = #{wxCoupon.parentTenantId} group by product_id) o on o.product_id = c.id - left join (SELECT count(id) as join_count, coupon_id FROM wx_order_press WHERE 1=1 - - and `tenant_id` = #{tenantId} + left join (SELECT count(id) as join_count, coupon_id FROM (SELECT count(id) as press_count, coupon_id FROM ( + SELECT * from wx_order_press${tenantEntity.shardTableSuffix} + ) wx_order_press WHERE 1=1 + + and `tenant_id` = #{wxCoupon.tenantId} - - and `parent_tenant_id` = #{parentTenantId} + + and `parent_tenant_id` = #{wxCoupon.parentTenantId} group by coupon_id) op2 on op2.coupon_id = c.id - left join (SELECT count(id) as xCount, coupon_id FROM wx_coupon_order WHERE coupon_order_status = 1 - - and `tenant_id` = #{tenantId} + left join (SELECT count(id) as xCount, coupon_id FROM (SELECT count(id) as join_count, coupon_id FROM (SELECT count(id) as press_count, coupon_id FROM ( + SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} + ) wx_coupon_order WHERE coupon_order_status = 1 + + and `tenant_id` = #{wxCoupon.tenantId} - - and `parent_tenant_id` = #{parentTenantId} + + and `parent_tenant_id` = #{wxCoupon.parentTenantId} group by coupon_id) cop on cop.coupon_id = c.id where c.type = 8 - - and c.`tenant_id` = #{tenantId} + + and c.`tenant_id` = #{wxCoupon.tenantId} - - and c.`parent_tenant_id` = #{parentTenantId} + + and c.`parent_tenant_id` = #{wxCoupon.parentTenantId} - - and c.id = #{id} + + and c.id = #{wxCoupon.id} - - and c.title like concat('%', #{title},'%') + + and c.title like concat('%', #{wxCoupon.title},'%') - - and c.`create_date` between #{startdate} and #{enddate} + + and c.`create_date` between #{wxCoupon.startdate} and #{wxCoupon.enddate} - order by ${sortColumns} - order by c.status asc,c.create_date desc + order by ${wxCoupon.sortColumns} + order by c.status asc,c.create_date desc - select DATE_FORMAT(wop.create_date,'%Y-%m-%d') xtime,count(wop.id) xcount from wx_coupon wc + select DATE_FORMAT(wop.create_date,'%Y-%m-%d') xtime,count(wop.id) xcount from ( + SELECT * from wx_coupon${tenantEntity.shardTableSuffix} + ) wc left join ( SELECT * from wx_order${tenantEntity.shardTableSuffix} ) wo on wo.product_id = wc.id diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 51e492064..c9a4d1952 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -109,7 +109,7 @@ -