From abc1caa456971c0cd554cc29cdae13f1645e5638 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 31 Oct 2019 23:57:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/MarkingDataReportController.java | 12 +- .../controller/WxBusinessController.java | 2 +- .../service/MallRolePermissionService.java | 3 +- .../service/MallUserActionService.java | 11 +- .../service/MarkingDataReportService.java | 15 +- .../iformall/service/WxBusinessService.java | 5 +- .../com/iformall/service/WxMallService.java | 15 +- .../impl/MallRolePermissionServiceImpl.java | 5 +- .../impl/MallUserActionServiceImpl.java | 5 +- .../impl/MarkingDataReportServiceImpl.java | 75 ++- .../service/impl/WxBusinessServiceImpl.java | 11 +- .../service/impl/WxChartServiceImpl.java | 458 +++++++++--------- .../service/impl/WxMallServiceImpl.java | 68 +++ .../controller/sys/HomeController.java | 6 +- .../controller/sys/MallRoleController.java | 16 +- .../controller/sys/WxBusinessController.java | 2 +- 16 files changed, 394 insertions(+), 315 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index c853ec5cf..9ee80cadf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -37,7 +37,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询券数据") public ResultData findCouponData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponData"); - return new ResultData(markingDataReportService.getCouponData(getTenantId())); + return new ResultData(markingDataReportService.getCouponData(getTenantInfo())); } @ApiOperation("查询券数据列表") @@ -48,7 +48,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponDataList"); - return new ResultData(markingDataReportService.getCouponDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getCouponDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询场景投放券数据") @@ -56,7 +56,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询场景投放券数据") public ResultData findSceneData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneData"); - return new ResultData(markingDataReportService.getSceneData(getTenantId())); + return new ResultData(markingDataReportService.getSceneData(getTenantInfo())); } @ApiOperation("查询场景营销数据列表") @@ -67,7 +67,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneDataList"); - return new ResultData(markingDataReportService.getSceneDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getSceneDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询触达用户数数据") @@ -75,7 +75,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询触达用户数数据") public ResultData touchUsersData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersData"); - return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantId())); + return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantInfo())); } @ApiOperation("查询触达用户数数据列表") @@ -86,7 +86,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersDataList"); - return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("触达用户数数据导出") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index b12994fac..d82b02018 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -29,7 +29,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("listAll") public ResultData listAll(Integer filter) { - return new ResultData(wxBusinessService.findListAll(getTenantId(),filter)); + return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter)); } } diff --git a/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java b/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java index 669c62c33..494d24092 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallRolePermission; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; @@ -54,7 +55,7 @@ public interface MallRolePermissionService { * @param roleId * @param perId */ - void savePermissions(String tenantId,Long roleId, Long[] perId); + void savePermissions(TenantEntity tenantEntity, Long roleId, Long[] perId); diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java index 19f7d9c7b..d12dc40b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserActionVo; public interface MallUserActionService { @@ -31,7 +32,15 @@ public interface MallUserActionService { */ void saveOrUpdate(MallUserAction record); - void saveActionInfo(String tenantId, Integer actionType, String ipAddress, Long userId, String actionDesc); + /** + * 保存用户操作 + * @param tenantEntity + * @param actionType + * @param ipAddress + * @param userId + * @param actionDesc + */ + void saveActionInfo(TenantEntity tenantEntity, Integer actionType, String ipAddress, Long userId, String actionDesc); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java b/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java index 780717c6e..a4fc29994 100644 --- a/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java +++ b/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxOrderReportDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import javax.servlet.http.HttpServletRequest; @@ -14,19 +15,19 @@ import java.util.Map; * Created by syf on 2018/8/28. */ public interface MarkingDataReportService { - Map getCouponData(String tenantId); + Map getCouponData(TenantEntity tenantEntity); - Map getSceneData(String tenantId); + Map getSceneData(TenantEntity tenantEntity); - Map getSceneDataHistory(String tenantId,String startDate,String endDate); + Map getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate); - PageInfo getCouponDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - PageInfo getTouchUsersReportList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getTouchUsersReportList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - List getTouchUsersReportData(String tenantId); + List getTouchUsersReportData(TenantEntity tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 3dcc72f14..315d4c027 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -2,7 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import java.io.Serializable; @@ -35,7 +35,7 @@ public interface WxBusinessService { * * @return */ - List findListAll(String tenantId, Integer filter); + List findListAll(TenantEntity tenantEntity, Integer filter); /** * 根据Id获得实体 @@ -48,7 +48,6 @@ public interface WxBusinessService { List getByIds(Collection ids); - List> businessDataList(WxBusiness wxBusiness,Long userid); ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 66c061bff..6c4c786f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -1,8 +1,11 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMall; +import java.util.List; + public interface WxMallService { /** @@ -45,12 +48,18 @@ public interface WxMallService { void deleteById(Long id); /** - * 根据tenant Id查寻 - * - * @param id + * 根据TenantId查询 + * @param tenantEntity + * @return */ + WxMall getByTenantInfo(TenantEntity tenantEntity); + + WxMall getByTenantInfoExt(TenantEntity tenantEntity); + + @Deprecated WxMall getByTenantId(String id); + @Deprecated WxMall getByTenantIdExt(String id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java index 6dc486518..65e8768e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.MallRolePermission; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallRolePermissionMapper; import com.iformall.service.MallRolePermissionService; @@ -59,7 +60,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Override - public void savePermissions(String tenantId, Long roleId, Long[] perId) { + public void savePermissions(TenantEntity tenantEntity, Long roleId, Long[] perId) { final IdWorker idWorker = IdWorker.get(); // 删除old mallUserRolePermissionMapper.deleteByRoleId(roleId); @@ -69,7 +70,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService MallRolePermission permission = new MallRolePermission(); permission.setId(idWorker.nextId()); permission.setPermissionId(pId); - permission.setTenantId(tenantId); + permission.updateTenantInfo(tenantEntity); permission.setRoleId(roleId); mallRolePermissionList.add(permission); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java index 5b3323551..04794a58c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserActionVo; import com.iformall.mapper.MallUserActionMapper; import com.iformall.service.MallUserActionService; @@ -41,11 +42,11 @@ public class MallUserActionServiceImpl implements MallUserActionService { } @Override - public void saveActionInfo(String tenantId, Integer actionType, String ipAddress, Long userId, String actionDesc) { + public void saveActionInfo(TenantEntity tenantEntity, Integer actionType, String ipAddress, Long userId, String actionDesc) { MallUserAction record = new MallUserAction(); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setTenantId(tenantId); + record.updateTenantInfo(tenantEntity); record.setType(actionType); record.setIp(ipAddress); record.setUserId(userId); 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 b4e2b015d..5d68e6a66 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxOrderReportDto; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCouponSendSendType; @@ -77,11 +78,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //取的当月券数据 @Override - public Map getCouponData(String tenantId) { + public Map getCouponData(TenantEntity tenantEntity) { //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); int todayCouponCount = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -105,7 +106,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //couponData HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List couponDatalist = wxCouponOrderMapper.couponDataMap(params); @@ -143,11 +144,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override - public Map getSceneData(String tenantId) { + public Map getSceneData(TenantEntity tenantEntity) { //今日营销投放券数 - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 @@ -161,7 +162,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); //停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 @@ -170,7 +171,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //停车发券被核销数 HashMap params1 = new HashMap<>(); - params1.put("tenantId", tenantId); + params1.put("tenantId", tenantEntity.getTenantId()); params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 @@ -179,7 +180,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //核销发券被核销数 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 @@ -188,7 +189,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); - params3.put("tenantId", tenantId); + params3.put("tenantId", tenantEntity.getTenantId()); params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 @@ -197,7 +198,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); - params4.put("tenantId", tenantId); + params4.put("tenantId", tenantEntity.getTenantId()); params4.put("startTime", addDay(-30)); params4.put("endTime", addDay(1)); params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 @@ -262,9 +263,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public PageInfo getCouponDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -283,7 +284,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } List couponIds = couponDatalist.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList()); WxCoupon wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(tenantId); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setIds(couponIds); List wxCoupons = wxCouponMapper.findList(wxCoupon); Map map = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId, p -> p)); @@ -299,13 +300,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto); - queryDto.setTenantId(tenantId); + queryDto.updateTenantInfo(tenantEntity); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) { params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); @@ -346,10 +347,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map countMap = new HashMap<>(); + params.clear(); + params.put("tenantId", tenantEntity.getTenantId()); if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //停车发券被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -359,8 +360,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付 //B端刷卡发券 被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -370,8 +369,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ //核销发券被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -381,8 +378,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list3.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ //购买发数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -392,8 +387,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){ //购买发数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -405,10 +398,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map triggerCountMap = new HashMap<>(); + params.clear(); + params.put("tenantId", tenantEntity.getTenantId()); if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //获取车辆进场数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -419,8 +412,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); } else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券 //获取B端刷卡数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -430,8 +421,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { //获取核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -440,8 +429,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) { //购买发券数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -450,8 +437,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())) { //购买发券数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -475,11 +460,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public Map getSceneDataHistory(String tenantId,String startDate, String endDate) { + public Map getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate) { Map result = new HashedMap(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); Date starttime = DateUtils.stringToDate(startDate); markingCouponDataReportDto.setStartTime(starttime); @@ -723,9 +708,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override - public PageInfo getTouchUsersReportList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getTouchUsersReportList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { //查询UV PV - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); if (markingCouponDataReportDto.getStartTime() != null) markingCouponDataReportDto.setStartTime(convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -738,7 +723,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //获取核销人数 //核销量 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -748,10 +733,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public List getTouchUsersReportData(String tenantId){ + public List getTouchUsersReportData(TenantEntity tenantEntity){ //查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 8c08e7d7f..b42048a19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; @@ -49,13 +50,13 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List findListAll(String tenantId, Integer filter) { + public List findListAll(TenantEntity tenantEntity, Integer filter) { if (filter == null) return wxBusinessMapper.findListAll(); else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) - return wxBusinessMapper.findListForCoupon(tenantId); + return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId()); else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) - return wxBusinessMapper.findListForMerchant(tenantId); + return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId()); else return wxBusinessMapper.findListAll(); } @@ -88,7 +89,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { - System.out.println("rent rentInfo is null:{}" + dbRent.getId()); + logger.warn("rent rentInfo is null-1: " + dbRent.getId()); continue; } Long price = dbRent.getPrice(); @@ -109,7 +110,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { - System.out.println("property rentInfo is null:{}" + dbRent.getId()); + logger.warn("property rentInfo is null-2:" + dbRent.getId()); continue; } logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId()); 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 066be9b9f..af96cbaab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.mapper.*; @@ -118,181 +119,185 @@ public class WxChartServiceImpl implements WxChartDataService { enddate = enddate + " 23:59:59"; } + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + //出租率 if (chart.equals(EnumChart.CZL.getCode())) { - return getRentRate(tenantId); + return getRentRate(tenantEntity); } //租金收缴率 if (chart.equals(EnumChart.ZJSJL.getCode())) { - return getRentMoneyRate(tenantId, startdate, enddate); + return getRentMoneyRate(tenantEntity, startdate, enddate); } //昨日报单率 if (chart.equals(EnumChart.ZRBDL.getCode())) { - return getYesterdayTradeRate(tenantId); + return getYesterdayTradeRate(tenantEntity); } //车流数据 if (chart.equals(EnumChart.CLSJ.getCode())) { - return getCarHistoryAndTodayAndHB(tenantId, false); + return getCarHistoryAndTodayAndHB(tenantEntity, false); } //券交易数据 if (chart.equals(EnumChart.QJYSJ.getCode())) { - return getCouponSaleAnalysis(tenantId); + return getCouponSaleAnalysis(tenantEntity); } //活跃用户数据 if (chart.equals(EnumChart.HYYHSJ.getCode())) { // TODO getActiveMemberAnalysis - return getActiveMemberTrade(tenantId); + return getActiveMemberTrade(tenantEntity); } //销售数据 if (chart.equals(EnumChart.XSSJ.getCode())) { - return getSaleAnalysis(tenantId); + return getSaleAnalysis(tenantEntity); } //解单数据 if (chart.equals(EnumChart.JDSJ.getCode())) { - return getMerchantTradeMonthly(tenantId); + return getMerchantTradeMonthly(tenantEntity); } ///// --- 车流 -- START //今日已绑车牌量 if (chart.equals(EnumChart.JRYBCPL.getCode())) { - return getBindCarAnalysis(tenantId); + return getBindCarAnalysis(tenantEntity); } //实时车流量 if (chart.equals(EnumChart.SSCLL.getCode())) { - return getCarDataCurrent(tenantId); + return getCarDataCurrent(tenantEntity); } // 历史车流量+今日车流量 + 上周同期 if (chart.equals(EnumChart.LSCLL.getCode())) { - return getCarHistoryAndTodayAndHB(tenantId, true); + return getCarHistoryAndTodayAndHB(tenantEntity, true); } //近一周新增停车会员 if (chart.equals(EnumChart.JYZXXZTCHY.getCode())) { - return getCarNewMemberCount(tenantId); + return getCarNewMemberCount(tenantEntity); } //近一周线上缴费车辆 if (chart.equals(EnumChart.JYZXSJFCL.getCode())) { - return getCarPayCarCountInWeek(tenantId); + return getCarPayCarCountInWeek(tenantEntity); } //近一周线上缴费金额 if (chart.equals(EnumChart.JYZXSJFJE.getCode())) { - return getCarPayCountInWeek(tenantId); + return getCarPayCountInWeek(tenantEntity); } //近一周新增会员数 if (chart.equals(EnumChart.JYZXZHYS.getCode())) { - return getCarNewMemberCountInWeek(tenantId); + return getCarNewMemberCountInWeek(tenantEntity); } //// --- 车流 -- END //昨日触达用户 if (chart.equals(EnumChart.ZRCDYH.getCode())) { - return getTodayTouchUser(tenantId); + return getTodayTouchUser(tenantEntity); } //今日券交易数据 if (chart.equals(EnumChart.JRQJYSJ.getCode())) { - return getTodayCouponCount(tenantId); + return getTodayCouponCount(tenantEntity); } //今日场景营销 if (chart.equals(EnumChart.JRCJYX.getCode())) { - return getSaleSceneCount(tenantId); + return getSaleSceneCount(tenantEntity); } //触达用户数 if (chart.equals(EnumChart.CDYHS.getCode())) { - return getTouchUserCount(tenantId); + return getTouchUserCount(tenantEntity); } //场景营销数据 if (chart.equals(EnumChart.CJYXSJ.getCode())) { - return getSceneData(tenantId); + return getSceneData(tenantEntity); } //新增用户 if (chart.equals(EnumChart.XZYH.getCode())) { - return getNewUserCount(tenantId); + return getNewUserCount(tenantEntity); } //活跃用户 if (chart.equals(EnumChart.HYYH.getCode())) { - return getActiveMemberCount(tenantId); + return getActiveMemberCount(tenantEntity); } //线上交易 if (chart.equals(EnumChart.XSJY.getCode())) { - return getOnlineOrderCount(tenantId); + return getOnlineOrderCount(tenantEntity); } //近一周新增用户数 if (chart.equals(EnumChart.JYZXZYHS.getCode())) { - return getNewMemberInWeek(tenantId); + return getNewMemberInWeek(tenantEntity); } //近一周活跃用户数 if (chart.equals(EnumChart.JYZHYYHS.getCode())) { - return getActiveMemberCountInWeek(tenantId); + return getActiveMemberCountInWeek(tenantEntity); } //近一周线上交易金额(元) if (chart.equals(EnumChart.JYZXSJYJE.getCode())) { - return getWeekMoneyData(tenantId); + return getWeekMoneyData(tenantEntity); } //新增用户趋势 if (chart.equals(EnumChart.XZYHQS.getCode())) { - return getNewMemberTradeMonthly(tenantId); + return getNewMemberTradeMonthly(tenantEntity); } //活跃用户趋势 if (chart.equals(EnumChart.HYYHQS.getCode())) { - return getActiveMemberTrade(tenantId); + return getActiveMemberTrade(tenantEntity); } //线上交易趋势 if (chart.equals(EnumChart.XSJYQS.getCode())) { - return getOnlineTrade(tenantId); + return getOnlineTrade(tenantEntity); } //微信用户总数 if (chart.equals(EnumChart.WXYHZS.getCode())) { - return getMemeberWechatTotal(tenantId); + return getMemeberWechatTotal(tenantEntity); } //会员总数 if (chart.equals(EnumChart.HYZS.getCode())) { - return getMemberTotalCount(tenantId); + return getMemberTotalCount(tenantEntity); } //微信用户累计趋势 if (chart.equals(EnumChart.WXYHLJQS.getCode())) { - return getMemberWechatJoinTrade(tenantId); + return getMemberWechatJoinTrade(tenantEntity); } //会员累计趋势 if (chart.equals(EnumChart.HYLJQS.getCode())) { - return getMemberJoinTrade(tenantId); + return getMemberJoinTrade(tenantEntity); } //微信用户新增趋势 if (chart.equals(EnumChart.WXYHXZQS.getCode())) { - return getWechatMemberTrade(tenantId); + return getWechatMemberTrade(tenantEntity); } //会员新增趋势 if (chart.equals(EnumChart.HYXZQS.getCode())) { - return getNewMemberTrade(tenantId); + return getNewMemberTrade(tenantEntity); } //拓客渠道 if (chart.equals(EnumChart.TKQD.getCode())) { - return getFromChannelAnalysis(tenantId); + return getFromChannelAnalysis(tenantEntity); } //场景排名 if (chart.equals(EnumChart.CJPM.getCode())) { - return getSceneAnalysis(tenantId); + return getSceneAnalysis(tenantEntity); } //会员性别比例 if (chart.equals(EnumChart.HYXBBL.getCode())) { - return getMemberSexRate(tenantId, startdate, enddate); + return getMemberSexRate(tenantEntity, startdate, enddate); } //会员绑定车牌率 if (chart.equals(EnumChart.HYBDCPL.getCode())) { - return getMemberBindCar(tenantId, startdate, enddate); + return getMemberBindCar(tenantEntity, startdate, enddate); } //会员年龄层次 if (chart.equals(EnumChart.HYNLCC.getCode())) { - return getMemberAgeAnalysis(tenantId, startdate, enddate); + return getMemberAgeAnalysis(tenantEntity, startdate, enddate); } //会员成长值 if (chart.equals(EnumChart.HYCZZ.getCode())) { - return getMemberGrowthAnalysis(tenantId, startdate, enddate); + return getMemberGrowthAnalysis(tenantEntity, startdate, enddate); } //会员手机品牌 if (chart.equals(EnumChart.HYSJPP.getCode())) { - return getMobileBrandAnalysis(tenantId, startdate, enddate); + return getMobileBrandAnalysis(tenantEntity, startdate, enddate); } //会员活跃度 if (chart.equals(EnumChart.HYHYD.getCode())) { - return getMemActivity(tenantId, startdate, enddate); + return getMemActivity(tenantEntity, startdate, enddate); } //卡营销数据 if (chart.equals(EnumChart.SALE_CARD.getCode())) { @@ -306,12 +311,12 @@ public class WxChartServiceImpl implements WxChartDataService { //砍价营销数据 if (chart.equals(EnumChart.SALE_PRESS.getCode())) { - return getSalePressAnalysis(paramsMap, tenantId, startdate, enddate); + return getSalePressAnalysis(paramsMap, tenantEntity, startdate, enddate); } //拼团营销数据 if (chart.equals(EnumChart.SALE_GROUP.getCode())) { - return getSaleGroupAnalysis(paramsMap, tenantId, startdate); + return getSaleGroupAnalysis(paramsMap, tenantEntity, startdate); } //首页商铺出租数据 @@ -321,32 +326,32 @@ public class WxChartServiceImpl implements WxChartDataService { //首页商铺出租数据 if (chart.equals(EnumChart.INDEX_BILL_RECE_RATE.getCode())) { - return getBillReceRate(tenantId, startdate); + return getBillReceRate(tenantEntity, startdate); } //首页场景发券 if (chart.equals(EnumChart.INDEX_COUPON_SCENE.getCode())) { - return new ResultData(markingDataReportService.getSceneDataHistory(tenantId, startdate, enddate)); + return new ResultData(markingDataReportService.getSceneDataHistory(tenantEntity, startdate, enddate)); } //首页营销数据 if (chart.equals(EnumChart.INDEX_SALE_DATA.getCode())) { - return getSaleDataHistory(tenantId, startdate, enddate); + return getSaleDataHistory(tenantEntity, startdate, enddate); } //商铺出租率走势 if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { - return getRentRateHistory(tenantId,paramsMap); + return getRentRateHistory(tenantEntity,paramsMap); } //业务分析 if (chart.equals(EnumChart.BUSINESS.getCode())) { - return getBusiness(tenantId,paramsMap); + return getBusiness(tenantEntity,paramsMap); } //电能分析 if (chart.equals(EnumChart.POWER_SUMMERY.getCode())) { - return getPowerSummery(tenantId,paramsMap); + return getPowerSummery(tenantEntity); } return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); @@ -416,17 +421,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 用电分析 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getPowerSummery(String tenantId,Map paramsMap){ + private ResultData getPowerSummery(TenantEntity tenantEntity){ Map resultMap = new HashMap<>(); KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addDay(-29)); kwMeterDataDto.setEndTime(addDay(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.DAY.getCode()); List kwMeterDataVosDaily = kwMeterDataService.findVoList(kwMeterDataDto); @@ -459,7 +464,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addMonth(-11)); kwMeterDataDto.setEndTime(addMonth(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.MONTH.getCode()); List kwMeterDataVosMonthly = kwMeterDataService.findVoList(kwMeterDataDto); @@ -483,7 +488,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addDay(0)); kwMeterDataDto.setEndTime(addDay(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.HOUR.getCode()); List kwMeterDataVosHourly = kwMeterDataService.findVoList(kwMeterDataDto); @@ -508,12 +513,12 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto.setStartTime(addDay(-1)); kwMeterDataDto.setEndTime(addDay(new Date(), -1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo yesterdayUsedPower = kwMeterDataService.getPower(kwMeterDataDto); kwMeterDataDto.setStartTime(addDay(0)); kwMeterDataDto.setEndTime(addDay(new Date(), 0)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo todayUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (todayUsedPower.getUsedPower() != null) @@ -534,14 +539,14 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto.setStartTime(addMonth(0)); kwMeterDataDto.setEndTime(addMonth(new Date(),0)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo thisMonthUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (thisMonthUsedPower.getUsedPower() != null) resultMap.put("thisMonthUsedPower",thisMonthUsedPower.getUsedPower()); kwMeterDataDto.setStartTime(addMonth(-1)); kwMeterDataDto.setEndTime(addMonth(new Date(),-1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo lastMonthUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (lastMonthUsedPower.getUsedPower() != null) resultMap.put("lastMonthUsedPower",lastMonthUsedPower.getUsedPower()); @@ -555,7 +560,7 @@ public class WxChartServiceImpl implements WxChartDataService { } KwMeter kwMeter = new KwMeter(); - kwMeter.setTenantId(tenantId); + kwMeter.updateTenantInfo(tenantEntity); kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); int meterCount = kwMeterService.selectCount(kwMeter); @@ -566,7 +571,7 @@ public class WxChartServiceImpl implements WxChartDataService { resultMap.put("boxMeterCount",boxMeterCount); KwMerchantMeter kwMerchantMeter = new KwMerchantMeter(); - kwMerchantMeter.setTenantId(tenantId); + kwMerchantMeter.updateTenantInfo(tenantEntity); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); int merchantMeterCount = kwMerchantMeterService.selectCount(kwMerchantMeter); resultMap.put("merchantMeterCount",merchantMeterCount); @@ -586,7 +591,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMerchantMeterDataDto.setLimitCount(null); List businessPower = kwMerchantMeterService.findDataVoList(kwMerchantMeterDataDto); - List businessList = wxBusinessService.findListAll(tenantId,null); + List businessList = wxBusinessService.findListAll(tenantEntity,null); businessList.stream().forEach(b->{ Optional businessData = businessPower.stream().filter(bd->bd.getBusinessId().equals(b.getId())).findAny(); if (businessData.isPresent()) { @@ -607,17 +612,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 业态分析 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBusiness(String tenantId,Map paramsMap){ + private ResultData getBusiness(TenantEntity tenantEntity,Map paramsMap){ Map resultMap = new LinkedMap(); List businessList = wxBusinessService.findList(new WxBusiness()); for (WxBusiness b:businessList) { resultMap.put(b.getTitle(),0l); } Map query = new HashedMap(); - query.put("tenantId",tenantId); + query.put("tenantId",tenantEntity.getTenantId()); query.put("id",paramsMap.get("id")); query.put("buildingId",paramsMap.get("buildingId")); List> mapList = wxMerchantMapper.findBusByFloorId(query); @@ -629,14 +634,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 首页商铺出租率走势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getRentRateHistory(String tenantId,Map paramsMap) { + private ResultData getRentRateHistory(TenantEntity tenantEntity,Map paramsMap) { Integer dateType = Integer.parseInt(paramsMap.get("dateType")); Map queryMap = new HashMap<>(); - queryMap.put("tenantId",tenantId); + queryMap.put("tenantId",tenantEntity.getTenantId()); queryMap.put("dateType",dateType); String building = paramsMap.get("building"); @@ -655,7 +660,7 @@ public class WxChartServiceImpl implements WxChartDataService { // get all WxShop query = new WxShop(); - query.setTenantId(tenantId); + query.updateTenantInfo(tenantEntity); List allList = wxShopMapper.findList(query); List> mapList = wxShopMapper.rentRateHistory(queryMap); @@ -700,12 +705,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 解单数据 - 月 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMerchantTradeMonthly(String tenantId) { + private ResultData getMerchantTradeMonthly(TenantEntity tenantEntity) { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); @@ -734,16 +739,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日已绑车牌量 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBindCarAnalysis(String tenantId) { + private ResultData getBindCarAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String yesterday = DateUtils.getTimeBefore(1, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date()); //绑定车牌 Map carParams = new HashMap<>(); - carParams.put("tenantId", tenantId); + carParams.put("tenantId", tenantEntity.getTenantId()); carParams.put("startdate", DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); carParams.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); long todaybindcar = wxCUserCarMapper.queryCarCount(carParams); @@ -773,16 +778,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 实时车流量 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarDataCurrent(String tenantId) { + private ResultData getCarDataCurrent(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); String yesterday = DateUtils.getTimeBefore(1, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date()); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); params.put("startdate", systemTime + " 05:00:00"); params.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); @@ -844,14 +849,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 数据塔台-数据总览-车流数据 | 数据塔台-车流数据-(历史车流量 + 今日车流量 + 上周同期) - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarHistoryAndTodayAndHB(String tenantId, boolean withOthers ) { + private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { String startdate; HashMap datamap = new HashMap<>(); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); startdate = DateUtils.getTimeBefore(30, new Date()); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); @@ -919,13 +924,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上缴费车辆 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarPayCarCountInWeek(String tenantId) { + private ResultData getCarPayCarCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -937,13 +942,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上缴费金额 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarPayCountInWeek(String tenantId) { + private ResultData getCarPayCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -978,16 +983,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 车流 - 近一周新增停车会员 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarNewMemberCount(String tenantId) { + private ResultData getCarNewMemberCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); try { wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate)); wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate)); @@ -997,7 +1002,7 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("oneWeekNewCarUserCount", wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); //停车会员总数 wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); datamap.put("newCarUserSumCount", wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); return new ResultData(datamap); @@ -1005,13 +1010,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 车流 - 近一周新增会员数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarNewMemberCountInWeek(String tenantId) { + private ResultData getCarNewMemberCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -1046,14 +1051,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTodayTouchUser(String tenantId) { + private ResultData getTodayTouchUser(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); //查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-1)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); @@ -1075,15 +1080,15 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTodayCouponCount(String tenantId) { + private ResultData getTodayCouponCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); int todayCouponCount = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -1111,14 +1116,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日场景营销 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleSceneCount(String tenantId) { + private ResultData getSaleSceneCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 String sceneDownDay = "--"; @@ -1137,14 +1142,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 触达用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTouchUserCount(String tenantId) { + private ResultData getTouchUserCount(TenantEntity tenantEntity) { String startdate; String enddate;//查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); @@ -1174,16 +1179,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 场景营销数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSceneData(String tenantId) { + private ResultData getSceneData(TenantEntity tenantEntity) { String startdate; String enddate; HashMap datamap = new HashMap<>(); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); //停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 @@ -1191,7 +1196,7 @@ public class WxChartServiceImpl implements WxChartDataService { //停车发券被核销数 HashMap params1 = new HashMap<>(); - params1.put("tenantId", tenantId); + params1.put("tenantId", tenantEntity.getTenantId()); params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 @@ -1200,7 +1205,7 @@ public class WxChartServiceImpl implements WxChartDataService { //核销发券被核销数 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 @@ -1209,7 +1214,7 @@ public class WxChartServiceImpl implements WxChartDataService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); - params3.put("tenantId", tenantId); + params3.put("tenantId", tenantEntity.getTenantId()); params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 @@ -1218,10 +1223,10 @@ public class WxChartServiceImpl implements WxChartDataService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); - params3.put("tenantId", tenantId); - params3.put("startTime", addDay(-30)); - params3.put("endTime", addDay(1)); - params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 + params4.put("tenantId", tenantEntity.getTenantId()); + params4.put("startTime", addDay(-30)); + params4.put("endTime", addDay(1)); + params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 List list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4); Map OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); @@ -1271,13 +1276,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 活跃用户 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewUserCount(String tenantId) { + private ResultData getNewUserCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); long allCount = wxCUserMapper.findCount(dto);//总数 Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1297,10 +1302,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 活跃用户 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberCount(String tenantId) { + private ResultData getActiveMemberCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1311,7 +1316,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1329,10 +1334,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 线上交易 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getOnlineOrderCount(String tenantId) { + private ResultData getOnlineOrderCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -1345,7 +1350,7 @@ public class WxChartServiceImpl implements WxChartDataService { WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); int thisMonthCount = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder);//月消费金额 c.clear(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1355,7 +1360,7 @@ public class WxChartServiceImpl implements WxChartDataService { startTime = c.getTime(); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); int todayCount = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder);//月消费金额 DecimalFormat df = new DecimalFormat("0.00"); datamap.put("todayCount", df.format((float) todayCount / 100));//今日消费金额 @@ -1364,10 +1369,10 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - private ResultData getNewMemberCount(String tenantId, int days, String returnName) { + private ResultData getNewMemberCount(TenantEntity tenantEntity, int days, String returnName) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1394,19 +1399,19 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周新增用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberInWeek(String tenantId) { - return getNewMemberCount(tenantId, 7, "weekVos"); + private ResultData getNewMemberInWeek(TenantEntity tenantEntity) { + return getNewMemberCount(tenantEntity, 7, "weekVos"); } /** * 近一周活跃用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberCountInWeek(String tenantId) { + private ResultData getActiveMemberCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1417,7 +1422,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -7); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1449,10 +1454,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上交易金额(元) - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getWeekMoneyData(String tenantId) { + private ResultData getWeekMoneyData(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); @@ -1467,7 +1472,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -7); Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1495,10 +1500,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 销售数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleAnalysis(String tenantId) { + private ResultData getSaleAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date sTime = c.getTime(); @@ -1508,7 +1513,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.set(Calendar.SECOND, 0); Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); List monthVos = new ArrayList<>();//周消费金额 Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { @@ -1534,7 +1539,7 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - private ResultData getActiveMemberAnalysis(String tenantId) { + private ResultData getActiveMemberAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1545,7 +1550,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1577,19 +1582,19 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 新增用户趋势-月 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberTradeMonthly(String tenantId) { - return getNewMemberCount(tenantId, 29, "monthVos"); + private ResultData getNewMemberTradeMonthly(TenantEntity tenantEntity) { + return getNewMemberCount(tenantEntity, 29, "monthVos"); } /** * 活跃用户趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberTrade(String tenantId) { + private ResultData getActiveMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1600,7 +1605,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1632,10 +1637,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 线上交易趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getOnlineTrade(String tenantId) { + private ResultData getOnlineTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); @@ -1646,7 +1651,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1674,13 +1679,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户总数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemeberWechatTotal(String tenantId) { + private ResultData getMemeberWechatTotal(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); //微信用户数据 long wxallCount = wxCUserMapper.findCount(dto);//总量 Calendar c = Calendar.getInstance(); @@ -1698,13 +1703,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员总数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberTotalCount(String tenantId) { + private ResultData getMemberTotalCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); long allCount = wxCUserBasicInfoMapper.findCount(dto);//总量 Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1721,14 +1726,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户累计趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberWechatJoinTrade(String tenantId) { + private ResultData getMemberWechatJoinTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); final int daysBefore = 29; WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1775,16 +1780,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCouponSaleAnalysis(String tenantId) { + private ResultData getCouponSaleAnalysis(TenantEntity tenantEntity) { String startdate; String enddate; HashMap datamap = new HashMap<>(); //couponData HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List couponDatalist = wxCouponOrderMapper.couponDataMap(params); @@ -1814,13 +1819,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员累计趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberJoinTrade(String tenantId) { + private ResultData getMemberJoinTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); final int daysBefore = 29; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1868,14 +1873,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 拓客渠道 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getFromChannelAnalysis(String tenantId) { + private ResultData getFromChannelAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); List channelStructureList = new ArrayList<>(); WxCUser wxCUser = new WxCUser(); - wxCUser.setTenantId(tenantId); + wxCUser.updateTenantInfo(tenantEntity); List channels = wxUserChannelMapper.findDistinctChannel(); for (WxUserChannel w : channels) { WxUserChannel c = new WxUserChannel(); @@ -1902,14 +1907,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户新增趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getWechatMemberTrade(String tenantId) { + private ResultData getWechatMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); final int daysBefore = 29; WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1938,13 +1943,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员新增趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberTrade(String tenantId) { + private ResultData getNewMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); final int daysBefore = 29; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1974,14 +1979,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 场景排名 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSceneAnalysis(String tenantId) { + private ResultData getSceneAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); List senceStructureList = new ArrayList<>(); WxCUser wxCUser = new WxCUser(); - wxCUser.setTenantId(tenantId); + wxCUser.updateTenantInfo(tenantEntity); List channels = wxUserChannelMapper.findDistinctChannel(); for (WxUserChannel w : channels) { WxUserChannel c = new WxUserChannel(); @@ -2005,16 +2010,16 @@ public class WxChartServiceImpl implements WxChartDataService { } /** - * 会员性别比例 TODO - * @param tenantId + * 会员性别比例 + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberSexRate(String tenantId, String startdate, String enddate) { + private ResultData getMemberSexRate(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); long all = wxCUserBasicInfoMapper.findCount(dto); @@ -2034,14 +2039,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员绑定车牌率 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberBindCar(String tenantId, String startdate, String enddate) { + private ResultData getMemberBindCar(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); long total = wxCUserBasicInfoMapper.findCount(dto); @@ -2070,15 +2075,15 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员年龄层次 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberAgeAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMemberAgeAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); long all = wxCUserBasicInfoMapper.findCount(dto); @@ -2098,21 +2103,20 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员成长值 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberGrowthAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMemberGrowthAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(tenantId); + wxLevelConfig.updateTenantInfo(tenantEntity); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigMapper.findList(wxLevelConfig); for (int i = 0; i < levelList.size(); i++) { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); if (i + 1 < levelList.size()) { @@ -2138,14 +2142,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员手机品牌 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMobileBrandAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMobileBrandAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); dto.setStartTime(startTime); @@ -2161,7 +2165,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantId, startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2175,14 +2179,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员活跃度 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemActivity(String tenantId, String startdate, String enddate) { + private ResultData getMemActivity(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); dto.setStartTime(startTime); @@ -2197,7 +2201,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantId, startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2320,12 +2324,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 砍价营销数据 * @param paramsMap - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getSalePressAnalysis(Map paramsMap, String tenantId, String startdate, String enddate) { + private ResultData getSalePressAnalysis(Map paramsMap, TenantEntity tenantEntity, String startdate, String enddate) { WxCoupon wxCoupon = new WxCoupon(); Map result = new HashedMap(); @@ -2363,7 +2367,7 @@ public class WxChartServiceImpl implements WxChartDataService { result.put("pressSuccHistory",pressSuccHistoryMap); result.put("pressPaymentHistory",pressPaymentHistoryMap); - wxCoupon.setTenantId(tenantId); + wxCoupon.updateTenantInfo(tenantEntity); result.put("pressSendHistoryTotal",getTotal(pressSendHistoryMap)); result.put("pressSuccHistoryCount",getTotal(pressSuccHistoryMap)); @@ -2385,13 +2389,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 拼团营销数据 * @param paramsMap - * @param tenantId + * @param tenantEntity * @param startdate * @return */ - private ResultData getSaleGroupAnalysis(Map paramsMap, String tenantId, String startdate) { + private ResultData getSaleGroupAnalysis(Map paramsMap, TenantEntity tenantEntity, String startdate) { Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); //默认时间本月第一天,截止到当天 Map result = new HashMap<>(); Date startTime = new Date(); @@ -2458,17 +2462,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 昨日解单率 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getYesterdayTradeRate(String tenantId) { + private ResultData getYesterdayTradeRate(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(tenantId); + wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(1); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); String reportdate = DateUtils.getTimeBefore(1, new Date()); wxMerchantTradeDaily.setReportDate(reportdate); List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); @@ -2488,12 +2492,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 出租率 - * @param tenantId + * @param tenantEntity */ - private ResultData getRentRate(String tenantId) { + private ResultData getRentRate(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.updateTenantInfo(tenantEntity); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List yczlist = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -2522,16 +2526,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 租金收缴率 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getRentMoneyRate(String tenantId, String startdate, String enddate) { + private ResultData getRentMoneyRate(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); //租金 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startdate", startdate + " 00:00:00"); params.put("enddate", enddate + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfo(params); @@ -2692,10 +2696,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 费用收缴数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBillReceRate(String tenantId, String startDateStr) { + private ResultData getBillReceRate(TenantEntity tenantEntity, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); startDate = DateUtils.getFirstDayForCurrMonth(startDate); @@ -2703,7 +2707,7 @@ public class WxChartServiceImpl implements WxChartDataService { //租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); @@ -2792,7 +2796,7 @@ public class WxChartServiceImpl implements WxChartDataService { //==========欠缴数据========= BigDecimal totalOwe = new BigDecimal(0); WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId(tenantId); + wxBillAll.updateTenantInfo(tenantEntity); wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); wxBillAll.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); List billTypeList = new ArrayList<>(); @@ -2868,10 +2872,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 营销数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleDataHistory(String tenantId, String startdate,String enddate) { + private ResultData getSaleDataHistory(TenantEntity tenantEntity, String startdate,String enddate) { Date startDate = DateUtils.getDateFromString(startdate,"yyyy-MM-dd HH:mm:ss").getTime(); Date endDate = DateUtils.getDateFromString(enddate,"yyyy-MM-dd HH:mm:ss").getTime(); @@ -2880,7 +2884,7 @@ public class WxChartServiceImpl implements WxChartDataService { TreeMap historyMap; Map countMap; WxCoupon couponQuery = new WxCoupon(); - couponQuery.setTenantId(tenantId); + couponQuery.updateTenantInfo(tenantEntity); couponQuery.setStartdate(startDate); couponQuery.setEnddate(endDate); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 26eb18d65..f395a2ebb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; @@ -117,6 +119,72 @@ public class WxMallServiceImpl implements WxMallService { } } + @Override + public WxMall getByTenantInfo(TenantEntity tenantEntity) { + StringBuilder sb = new StringBuilder(); + sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); + String key = sb.toString(); + + ValueOperations operations = mallRedisTemplate.opsForValue(); + // 缓存 + boolean hasKey = mallRedisTemplate.hasKey(key); + if(hasKey) { + // 从缓存获取用户信息 + WxMall mall = operations.get(key); + return mall; + } + // 不存在,从数据库中获取 + WxMall q = new WxMall() {{ + setTenantId(tenantEntity.getTenantId()); + }}; + WxMall mall = null; + try { + mall = wxMallMapper.selectOne(new QueryWrapper<>(q)); + } catch (Exception e) { + logger.error(e.getMessage()); + } + // 插入缓存 + if (mall != null) { + operations.set(key, mall, 3600, TimeUnit.SECONDS); + } + return mall; + } + + @Override + public WxMall getByTenantInfoExt(TenantEntity tenantEntity) { + WxMall mall = getByTenantInfo(tenantEntity); + if (mall == null) { + return null; + } + WxMallBuilding wxMallBuilding = new WxMallBuilding() {{ + updateTenantInfo(tenantEntity); + }}; + List buildings = wxMallBuildingMapper.findList(wxMallBuilding); + List wxMallBuildings = buildings.stream().map(b -> { + WxMallBuilding tempb = new WxMallBuilding(); + tempb.setId(b.getId()); + tempb.setName(b.getName()); + return tempb; + }).collect(Collectors.toList()); + + for(WxMallBuilding building:wxMallBuildings){ + WxMallFloor wxMallFloor = new WxMallFloor(); + wxMallFloor.setBuildingId(building.getId()); + List wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { + WxMallFloor tempf = new WxMallFloor(); + tempf.setId(f.getId()); + tempf.setFloorName(f.getFloorName()); + tempf.setTotalArea(f.getTotalArea()); + tempf.setOperatingArea(f.getOperatingArea()); + return tempf; + }).collect(Collectors.toList()); + building.setFloors(wxMallFloors); + + } + mall.setBuildings(wxMallBuildings); + return mall; + } + @Override public WxMall getByTenantId(String id) { String key = Constant.MALL_KEY_PREV + String.valueOf(id); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 47e3799e8..b93d506d8 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -145,7 +145,7 @@ public class HomeController extends BaseController { if(isLogin) { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if(mall == null) { @@ -239,7 +239,7 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if (mall == null) { @@ -339,7 +339,7 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if (mall == null) { diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 1a483745a..64eb4833b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.MallRole; import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserRole; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; @@ -111,12 +112,11 @@ public class MallRoleController extends BaseController { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色"); } - String tenantId = currentUser.getTenantId(); - int count = checkUnique(sysRole.getName(), tenantId); + int count = checkUnique(sysRole.getName(), currentUser); if (sysRole.getId() == null && count > 0) { return new ResultData(ResultData.ERROR, "角色名已存在"); } - sysRole.setTenantId(tenantId); + sysRole.updateTenantInfo(currentUser); sysRoleService.saveOrUpdate(sysRole); // SysRolePermissionService.deleteById(id); if (StringUtils.isNoneBlank(sysRole.getMenus())) { @@ -124,7 +124,7 @@ public class MallRoleController extends BaseController { for (String mId : sysRole.getMenus().split(",")) { mIds.add(Long.valueOf(mId)); } - sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); + sysRolePermissionService.savePermissions(currentUser, sysRole.getId(), mIds.toArray(new Long[]{})); } return new ResultData(); } @@ -140,7 +140,7 @@ public class MallRoleController extends BaseController { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加角色"); } Assert.notNull(sysRole.getName(), "角色名不能为空"); - Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); + Assert.isTrue(checkUnique(sysRole.getName(), currentUser)>0, "重复的角色名"); sysRoleService.saveOrUpdate(sysRole); return new ResultData(); } @@ -156,7 +156,7 @@ public class MallRoleController extends BaseController { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能更新角色"); } if (sysRole.getName() != null) { - Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); + Assert.isTrue(checkUnique(sysRole.getName(), currentUser)>1, "角色名已存在"); } sysRoleService.saveOrUpdate(sysRole); // Assert.notNull(sysRole.getName(), "角色名不能为空"); @@ -184,10 +184,10 @@ public class MallRoleController extends BaseController { return new ResultData(Result.SUCCESS, "删除成功", null); } - private int checkUnique(String name, String tenantId) { + private int checkUnique(String name, TenantEntity tenantEntity) { MallRole role = new MallRole(); role.setName(name); - role.setTenantId(tenantId); + role.updateTenantInfo(tenantEntity); return sysRoleService.countList(role); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index e01d23700..e433a5bcc 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -33,7 +33,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantId(),null); + final List busList = wxBusinessService.findListAll(getTenantInfo(),null); return new ResultData(busList); }