diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index f4c6cf1c8..b74a94c86 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -62,7 +62,6 @@ public class BaseController { /** * 返回租户信息 - * 集团版帐号tenantId为空,parentTenantId为集团tenantId * @return */ public TenantEntity getTenantInfo(){ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 1b2352b07..7d05a23bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -696,6 +696,9 @@ public class WxRentContractController extends WxContractBaseController { public ResultData getPayAccountInfo() { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo()); + if(payAccountBill == null){ + return new ResultData(Result.ERROR,"未找到收款数据"); + } Map map = new HashMap<>(); if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { map.put("bankAccountName", payAccountBill.getBankAccountName()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java index d832e92f1..b916b0f72 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java @@ -46,11 +46,6 @@ public class WxUserStatisticsController extends BaseController { plat = EnumAppPlat.WX.getCode(); } TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); //昨日同比 Map map = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); @@ -99,11 +94,6 @@ public class WxUserStatisticsController extends BaseController { plat = EnumAppPlat.WX.getCode(); } TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.updateTenantInfo(tenantEntity); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 7bcde8520..8a00f3e29 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -307,11 +307,6 @@ public class WxUserStructureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserCount"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); //昨日同比 Map map = new HashMap<>(); @@ -476,11 +471,6 @@ public class WxUserStructureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserByChannel"); List sceneList = null; TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxCUser.updateTenantInfo(tenantEntity); if (StringUtils.isNotBlank(wxCUser.getChannelName())) { WxUserChannel c = new WxUserChannel(); 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 1c9e41601..1557a312b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -73,10 +73,6 @@ 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"); - if(StringUtils.isBlank(getTenantInfo().getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } return new ResultData(markingDataReportService.getSceneDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 92eb76578..719846b0e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -34,10 +34,6 @@ public class WxMerchantMicroPayController extends BaseController { public ResultData listMonth() { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); wxOrderReportDto.updateTenantInfo(tenantEntity); wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); @@ -52,10 +48,6 @@ public class WxMerchantMicroPayController extends BaseController { public ResultData detail(@RequestParam Long merchantId) { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); wxOrderReportDto.updateTenantInfo(tenantEntity); wxOrderReportDto.setMerchantId(merchantId); @@ -68,10 +60,6 @@ public class WxMerchantMicroPayController extends BaseController { public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } if (wxOrderReportDto == null) wxOrderReportDto = new WxOrderReportDto(); wxOrderReportDto.updateTenantInfo(tenantEntity); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 83a2b4dc8..e1b6dc91b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -61,11 +61,6 @@ public class WxCUserDataController extends BaseController { plat = EnumAppPlat.WX.getCode(); } TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); @@ -328,10 +323,6 @@ public class WxCUserDataController extends BaseController { public ResultData findUserAmountData() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } Calendar c = Calendar.getInstance(); Date today = c.getTime(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -413,10 +404,6 @@ public class WxCUserDataController extends BaseController { public ResultData findUserConsumeAmount() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserConsumeAmount"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index c77a9e09c..7f9d46cc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -233,9 +233,6 @@ public class HomeController extends BaseController { if (StringUtils.isNotBlank(subTenantId)) { session.setAttribute(UserSession.tenantId, subTenantId); session.setAttribute(UserSession.parentTenantId, tenantId); - } else { - session.setAttribute(UserSession.tenantId, null); - session.setAttribute(UserSession.parentTenantId, tenantId); } } return new ResultData(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index 0f91e919e..a83e56aeb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index acc6b987c..f7dfcd44b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -5,10 +5,13 @@ import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumChartType; import com.iformall.mapper.*; +import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserCarService; +import com.iformall.service.cuser.CUserServiceFactory; import com.iformall.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -53,6 +56,12 @@ public class ChartDataSchedule { @Autowired WxCUserCarService wxCUserCarService; + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; + + @Autowired + private CUserServiceFactory cuserFactory; + /** * 每天7点执行 @@ -60,21 +69,75 @@ public class ChartDataSchedule { @Async @Scheduled(cron = "0 0 7 * * ?") public void createData() { + createUserData(); createCarData(); createSaleData(); createMerchantTradeData(); } + /** + * 微信新增用户、抖音新增用户、ali新增用户,新增会员 + */ + public void createUserData() { + Date createtime = new Date(); + String yesterday = DateUtils.getTimeBefore(1, createtime); + Date date = DateUtils.stringToDate(yesterday); + String today = DateUtils.getSystemTime("yyyy-MM-dd"); + Date endDate = DateUtils.stringToDate(today); + + WxChartDataEntity wxChartDataEntity = new WxChartDataEntity(); + wxChartDataEntity.setQuerytime(date); + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + dto.setStartTime(date); + dto.setEndTime(endDate); + + List wxMalls = wxMallMapper.findList(null); + for (WxMall wxMall : wxMalls) { + TenantEntity tenantEntity = wxMall.getTenantInfo(); + dto.updateTenantInfo(tenantEntity); + wxChartDataEntity.updateTenantInfo(tenantEntity); + wxChartDataEntity.setType(EnumChartType.WX_USER.getCode()); + int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); + if (count == 0) { + logger.info("微信用户数>>>>>>>>>>>>>>>>>>>>>>>>>>"); + long wxUserCount = cuserFactory.getCUserService(EnumAppPlat.WX).findCount(dto); + addChartData(tenantEntity, String.valueOf(wxUserCount), EnumChartType.WX_USER.getCode(), date, createtime); + } + wxChartDataEntity.setType(EnumChartType.TT_USER.getCode()); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); + if (count == 0) { + logger.info("抖音用户数>>>>>>>>>>>>>>>>>>>>>>>>>>"); + long ttUserCount = cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).findCount(dto); + addChartData(tenantEntity, String.valueOf(ttUserCount), EnumChartType.TT_USER.getCode(), date, createtime); + } +// wxChartDataEntity.setType(EnumChartType.ALI_USER.getCode()); +// count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); +// if (count == 0) { +// logger.info("支付宝用户>>>>>>>>>>>>>>>>>>>>>>>>>>"); +// } + wxChartDataEntity.setType(EnumChartType.BASIC_USER.getCode()); + count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); + if (count == 0) { + logger.info("会员数>>>>>>>>>>>>>>>>>>>>>>>>>>"); + long basicUserCount = wxCUserBasicInfoService.findCount(dto); + addChartData(tenantEntity, String.valueOf(basicUserCount), EnumChartType.BASIC_USER.getCode(), date, createtime); + } + + } + } + /** * 出场车辆、缴费车辆、缴费金额、新增会员、新增停车会员、已绑车辆 */ public void createCarData() { HashMap params = new HashMap<>(); Date createtime = new Date(); - String startdate = DateUtils.getTimeBefore(1, createtime); - Date date = DateUtils.stringToDate(startdate); - params.put("startdate", startdate + " 00:00:00"); - params.put("enddate", startdate + " 23:59:59"); + String yesterday = DateUtils.getTimeBefore(1, createtime); + Date date = DateUtils.stringToDate(yesterday); + String today = DateUtils.getSystemTime("yyyy-MM-dd"); + Date endDate = DateUtils.stringToDate(today); + params.put("startdate", yesterday + " 00:00:00"); + params.put("enddate", today + " 00:00:00"); WxChartDataEntity wxChartDataEntity = new WxChartDataEntity(); wxChartDataEntity.setQuerytime(date); @@ -90,28 +153,32 @@ public class ChartDataSchedule { if (count == 0) { logger.info("入场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes",EnumCarCmd.getCarIn()); - carInData(params, createtime, date, tenantEntity); + Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); + addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_IN.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes",EnumCarCmd.getCarOut()); - carOutData(params, createtime, date, tenantEntity); + Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); + addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - carPaidData(params, createtime, date, tenantEntity); + Long carPayFeeCount = wxCarCmdLogMapper.queryHistoryCount(params); + addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - carPayFeeData(params, createtime, date, tenantEntity); + BigDecimal fee = wxCarCmdLogMapper.queryCarPay(params); + addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); // count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); @@ -123,13 +190,19 @@ public class ChartDataSchedule { count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carNewMemberData(createtime, date, tenantEntity); + WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); + wxCUserBasicInfoDto.setStartTime(date); + wxCUserBasicInfoDto.setEndTime(endDate); + Integer carUserCount = wxCUserCarService.countUser(wxCUserBasicInfoDto); + addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carBindData(params, createtime, date, tenantEntity); + Long todaybindcar = wxCUserCarMapper.queryCarCount(params); + addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); } } } @@ -208,47 +281,6 @@ public class ChartDataSchedule { } } - - public void carBindData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - Long todaybindcar = wxCUserCarMapper.queryCarCount(params); - addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); - } - - public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) { - WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); - wxCUserBasicInfoDto.setStartTime(date); - wxCUserBasicInfoDto.setEndTime(date); - Integer carUserCount = wxCUserCarService.countUser(wxCUserBasicInfoDto); - addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); - } - -// public void carMemberData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { -// List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params); -// Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count"); -// addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); -// } - - public void carPayFeeData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - BigDecimal fee = wxCarCmdLogMapper.queryCarPay(params); - addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); - } - - public void carPaidData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - Long carPayFeeCount = wxCarCmdLogMapper.queryHistoryCount(params); - addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); - } - - public void carOutData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); - addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); - } - - public void carInData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); - addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_IN.getCode(), date, createtime); - } - private void addChartData(TenantEntity tenantEntity, String result, Integer type, Date querytime, Date createtime) { logger.info("即将插入数据>>>>>>>>>>>>>>>>>>>>>>>"); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java index cc799e9a0..7f825df3f 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java @@ -20,7 +20,7 @@ public enum EnumChart { JYZXXZTCHY(13, "近一周新增停车会员"), JYZXSJFCL(14, "近一周线上缴费车辆"), JYZXSJFJE(15, "近一周线上缴费金额"), - JYZXZHYS(16, "近一周新增会员数"), +// JYZXZHYS(16, "近一周新增会员数"),弃用了 ZRCDYH(17, "昨日触达用户"), JRQJYSJ(18, "今日券交易数据"), JRCJYX(19, "今日场景营销"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java index c6c3ce04d..0f2e2fd54 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java @@ -11,8 +11,15 @@ public enum EnumChartType { // CAR_MEMBER(4, "新增会员"), CAR_NEW_MEMBER(5, "新增停车会员"), CAR_BIND(6, "已绑车辆"), + SALE_COUPON_PRICE(8, "销售总交易额"), - MERCHANT_TRADE(9, "解单金额"),; + MERCHANT_TRADE(9, "解单金额"), + + WX_USER(11,"微信用户"), + TT_USER(12,"抖音用户"), + ALI_USER(13,"Ali用户"), + BASIC_USER(14,"会员"); + public static EnumChartType getEnum(Integer code) { for (EnumChartType value : values()) { if (value.getCode().equals(code)) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java index c2e4df5d6..8c34b650e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java @@ -16,6 +16,4 @@ public interface WxCUserCarMapper extends CommonMapper { long queryCarCount(Map carParams); - List> queryCarCountHistory(HashMap params); - } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index 78da4b71e..61aa26e6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -306,16 +306,6 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - if(StringUtils.isBlank(dto.getTenantId()) - && StringUtils.isNotBlank(dto.getParentTenantId())){ - List tenantEntitys = wxMallMapper.getTenantEntitys(dto); - long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); - count += ttCUserMapper.findCount(dto); - } - return count; - } return ttCUserMapper.findCount(dto); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index a0f61a963..0d5ff2465 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -314,16 +314,6 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - if(StringUtils.isBlank(dto.getTenantId()) - && StringUtils.isNotBlank(dto.getParentTenantId())){ - List tenantEntitys = wxMallMapper.getTenantEntitys(dto); - long count = 0l; - for (TenantEntity tenantEntity:tenantEntitys) { - dto.updateTenantInfo(tenantEntity); - count += wxCUserMapper.findCount(dto); - } - return count; - } return wxCUserMapper.findCount(dto); } 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 7e047fa49..9826bda7f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -136,8 +136,7 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired private WxShopService wxShopService; - - + @Override public ResultData queryData(Map paramsMap) { String tenantId = paramsMap.get("tenantId"); @@ -225,9 +224,9 @@ public class WxChartServiceImpl implements WxChartDataService { return getCarPayCountInWeek(tenantEntity); } //近一周新增会员数 - if (chart.equals(EnumChart.JYZXZHYS.getCode())) { - return getCarNewMemberCountInWeek(tenantEntity); - } +// if (chart.equals(EnumChart.JYZXZHYS.getCode())) { +// return getCarNewMemberCountInWeek(tenantEntity); +// } //// --- 车流 -- END //昨日触达用户 if (chart.equals(EnumChart.ZRCDYH.getCode())) { @@ -1066,54 +1065,6 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - - /** - * 车流 - 近一周新增会员数 - * @param tenantEntity - * @return - */ - private ResultData getCarNewMemberCountInWeek(TenantEntity tenantEntity) { -// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - HashMap datamap = new HashMap<>(); - HashMap weekParams = new HashMap<>(); -// weekParams.put("tenantEntitys", tenantEntitys); - weekParams.put("tenantId", tenantEntity.getTenantId()); - weekParams.put("finalTenantId", tenantEntity.getFinalTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - weekParams.put("parentTenantId", tenantEntity.getParentTenantId()); - } - String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); - String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); - weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); - weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); - weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); - List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams); - Map weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> { - return (String) m.get("create_time"); - }, m -> { - return m.get("count"); - })); - List days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0"); - List timeList = new ArrayList<>(); - List valList = new ArrayList<>(); - for (String date : days) { - String newdate = date.substring(5, date.length()).replace("-", "/"); - Object o = weekCarCollect.get(newdate); - timeList.add(newdate); - if (o == null) { - valList.add(0L); - } else { - valList.add(o); - } - } - - Map map = new HashMap(); - map.put("index", timeList); - map.put("val", valList); - datamap.put("oneWeekNewCarUserHistory", map); - return new ResultData(datamap); - } - /** * 今日券交易数据 * @param tenantEntity diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index f07ed08af..17ea2c401 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -557,7 +557,7 @@ -