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 b634b884f..83a2b4dc8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -145,11 +145,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); long allCount = cuserFactory.getCUserService(EnumAppPlat.getByCode(plat)).findCount(dto); @@ -176,11 +171,6 @@ public class WxCUserDataController extends BaseController { public ResultData findBasicUserAddCount() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findBasicUserAddCount"); TenantEntity tenantEntity = getTenantInfo(); - if(StringUtils.isBlank(tenantEntity.getTenantId())){ - //todo 集团版查询数据待重构 - return new ResultData("集团版查询数据待重构"); - } -// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.updateTenantInfo(tenantEntity); long allCount = wxCUserBasicInfoService.findCount(dto); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index b24513e39..9de51e554 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -70,7 +70,6 @@ public class ChartDataSchedule { */ public void createCarData() { HashMap params = new HashMap<>(); - params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); Date createtime = new Date(); String startdate = DateUtils.getTimeBefore(1, createtime); Date date = DateUtils.stringToDate(startdate); @@ -85,35 +84,41 @@ public class ChartDataSchedule { TenantEntity tenantEntity = wxMall.getTenantInfo(); params.put("tenantId", tenantEntity.getTenantId()); params.put("finalTenantId", tenantEntity.getFinalTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", wxMall.getTenantId()); - } wxChartDataEntity.updateTenantInfo(tenantEntity); - wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); + wxChartDataEntity.setType(EnumChartType.CAR_IN.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); + if (count == 0) { + logger.info("入场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); + params.put("cmdTypes",EnumCarCmd.getCarIn()); + carInData(params, createtime, date, tenantEntity); + } + 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); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { - params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); + params.put("cmdTypes", EnumCarCmd.getCarPay()); carPaidData(params, createtime, date, tenantEntity); } 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); } - wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); - count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); - if (count == 0) { - logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carMemberData(params, createtime, date, tenantEntity); - } +// wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); +// count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); +// if (count == 0) { +// logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); +// carMemberData(params, createtime, date, tenantEntity); +// } wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { @@ -210,46 +215,40 @@ public class ChartDataSchedule { } public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) { -// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); - wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoDto.setStartTime(date); wxCUserBasicInfoDto.setEndTime(date); Integer carUserCount = wxCUserCarService.countUser(wxCUserBasicInfoDto); addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); } - public void carMemberData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { - params.put("finalTenantId",tenantEntity.getFinalTenantId()); - List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params); - Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count"); - addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); - } +// 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) { - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - params.put("tenantEntitys",tenantEntitys); - List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(params); - BigDecimal fee = weekCarPayHistoryList.isEmpty() ? new BigDecimal(0) : (BigDecimal) weekCarPayHistoryList.get(0).get("fee"); + 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) { - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - params.put("tenantEntitys",tenantEntitys); - Long carPayFeeCount = wxCarCmdLogMapper.queryWeekCarPayCount(params); + 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) { - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - params.put("tenantEntitys",tenantEntitys); - List> historylist = wxCarCmdLogMapper.queryHistory(params); - Long carOutCount = historylist.isEmpty() ? 0L : (Long) historylist.get(0).get("carcount"); + 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/domain/po/WxChartDataEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java index 060cabb5c..84abd933b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -34,4 +35,9 @@ public class WxChartDataEntity extends TenantEntity { .append('}'); return sb.toString(); } + + @TableField(exist = false) + private Date startTime; + @TableField(exist = false) + private Date endTime; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java index 2757a5057..77636b9de 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.ArrayList; +import java.util.List; + /** * Created by Stormeye on 2018/08/09. */ @@ -11,23 +14,27 @@ public enum EnumCarCmd { CAR_ETCP_CALLBACK_UNBIND(603, "ETCP车辆解绑通知"), CAR_ETCP_CALLBACK_PAY_MANUAL(604, "ETCP支付结果通知"), CAR_ETCP_CALLBACK_UNPAY(605, "ETCP停车费获取"), + CAR_TJD_CALLBACK_REGISTER(610, "停简单注册车牌"), CAR_TJD_CALLBACK_PARK_IN(611, "停简单进场通知"), CAR_TJD_CALLBACK_PARK_OUT(612, "停简单离场通知"), CAR_TJD_CALLBACK_PAID(613, "停简单支付通知"), CAR_TJD_CALLBACK_REFUND(614, "停简单退款通知"), + CAR_CYF_CALLBACK_PARK_IN(620,"车易付进场通知"), - CAR_CYF_CALLBACK_PARK_OUT(621,"车易付进场通知"), + CAR_CYF_CALLBACK_PARK_OUT(621,"车易付出场通知"), CAR_CYF_CALLBACK_UNBIND(622,"车易付解绑车牌通知"), CAR_CYF_CALLBACK_PAID(623,"车易付支付通知"), + CAR_JIESHUN_CALLBACK_PARK_IN(624,"捷顺进场通知"), - CAR_JIESHUN_CALLBACK_PARK_OUT(625,"捷顺进场通知"), + CAR_JIESHUN_CALLBACK_PARK_OUT(625,"捷顺出场通知"), CAR_JIESHUN_CALLBACK_UNBIND(626,"捷顺解绑车牌通知"), CAR_JIESHUN_CALLBACK_PAID(627,"捷顺支付通知"), - CAR_HAIKANGWEISHI_CALLBACK_PARK_IN(628,"捷顺进场通知"), - CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT(629,"捷顺进场通知"), - CAR_HAIKANGWEISHI_CALLBACK_UNBIND(630,"捷顺解绑车牌通知"), - CAR_HAIKANGWEISHI_CALLBACK_PAID(631,"捷顺支付通知") + + CAR_HAIKANGWEISHI_CALLBACK_PARK_IN(628,"海康进场通知"), + CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT(629,"海康出场通知"), + CAR_HAIKANGWEISHI_CALLBACK_UNBIND(630,"海康解绑车牌通知"), + CAR_HAIKANGWEISHI_CALLBACK_PAID(631,"海康支付通知") ; public static EnumCarCmd getEnum(Integer code) { @@ -39,6 +46,39 @@ public enum EnumCarCmd { return null; } + //获取入场标识 + public static List getCarIn(){ + List list = new ArrayList<>(); + list.add(CAR_ETCP_CALLBACK_PARK_IN.getCode()); + list.add(CAR_TJD_CALLBACK_PARK_IN.getCode()); + list.add(CAR_CYF_CALLBACK_PARK_IN.getCode()); + list.add(CAR_JIESHUN_CALLBACK_PARK_IN.getCode()); + list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_IN.getCode()); + return list; + } + + //获取出场标识 + public static List getCarOut(){ + List list = new ArrayList<>(); + list.add(CAR_ETCP_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_TJD_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_CYF_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_JIESHUN_CALLBACK_PARK_OUT.getCode()); + list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT.getCode()); + return list; + } + + //获取支付标识 + public static List getCarPay(){ + List list = new ArrayList<>(); + list.add(CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); + list.add(CAR_TJD_CALLBACK_PAID.getCode()); + list.add(CAR_CYF_CALLBACK_PAID.getCode()); + list.add(CAR_JIESHUN_CALLBACK_PAID.getCode()); + list.add(CAR_HAIKANGWEISHI_CALLBACK_PAID.getCode()); + return list; + } + private Integer code; private String message; @@ -54,4 +94,5 @@ public enum EnumCarCmd { public String getMessage() { return message; } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java index d7c20cf01..c6c3ce04d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java @@ -4,10 +4,11 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumChartType { + CAR_IN(10,"入场车辆"), CAR_OUT(1, "出场车辆"), CAR_PAID(2, "缴费车辆"), CAR_PAY_FEE(3, "缴费金额"), - CAR_MEMBER(4, "新增会员"), +// CAR_MEMBER(4, "新增会员"), CAR_NEW_MEMBER(5, "新增停车会员"), CAR_BIND(6, "已绑车辆"), SALE_COUPON_PRICE(8, "销售总交易额"), diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index 0cfcb282f..257731f2d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -3,6 +3,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCarCmdLog; import com.iformall.domain.vo.MarkingSceneDataVo; + +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -19,19 +21,17 @@ public interface WxCarCmdLogMapper extends CommonMapper { List findList(WxCarCmdLog wxCarCmdLog); List> queryHistory(HashMap params); + long queryHistoryCount(HashMap params); List> queryTodayCar(HashMap params); List> queryWeekCarPay(HashMap params); + BigDecimal queryCarPay(HashMap params); List queryForSceneRepotyHistoryCar(HashMap params); - List> queryPlateNumberList(Map carParams); - List queryTenantInfoBySynId(WxCarCmdLog wxCarCmdLog); - Long queryWeekCarPayCount(HashMap params); - WxCarCmdLog queryByOrderId(WxCarCmdLog carCmdLog); WxCarCmdLog queryBySynId(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxChartDataMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxChartDataMapper.java index 780d8a43b..8580e6e40 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxChartDataMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxChartDataMapper.java @@ -3,5 +3,10 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxChartDataEntity; +import java.util.List; + public interface WxChartDataMapper extends CommonMapper { + + List findList(WxChartDataEntity chartData); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 993d8982f..ab91b30e3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -16,8 +16,6 @@ public interface WxRentContractMapper extends CommonMapper List findList(WxRentContract wxRentContract); - int queryRentContractCountByStatus(WxRentContract wxRentContract); - void updateStatusForUnsign(WxRentContract wxRentContract); void updateApplyStatus(WxRentContract wxRentContract); @@ -60,5 +58,6 @@ public interface WxRentContractMapper extends CommonMapper List> currentValidByMerchantId(WxRentContract rentContract); List getUsedRentShopIds(WxRentContract wxRentContract); - + + long findCount(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 41cc84ef7..7a6eb713a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -47,4 +47,5 @@ public interface WxShopMapper extends CommonMapper { List newFindShopVoList(@Param("tenantId")String tenantId, @Param("shopIds")List shopIds); + long findCount(WxShop wxShop); } diff --git a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java index 709d31e92..ae6deb2b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java @@ -13,10 +13,10 @@ public interface DataTowerService { /** * 把这个接口拆开 - * @param tenantEntity + * @param * @return */ - Map queryRunning(TenantEntity tenantEntity); +// Map queryRunning(TenantEntity tenantEntity); Map queryOccupancyRate(TenantEntity tenantInfo); Map queryRentCollectionRate(TenantEntity tenantInfo); Map queryDeclarationRate(TenantEntity tenantInfo); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index dd1309d3d..6b17651cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -54,7 +54,7 @@ public interface WxCouponChannelService { ResultData change(WxCouponChannel wxCouponChannel); - int countCoupon(WxCouponChannel wxCouponChannel, List tenantEntitys); + int countCoupon(WxCouponChannel wxCouponChannel); List newfindListVo(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 7df739ca1..5b0e356f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -212,7 +212,7 @@ public interface WxCouponOrderService { */ Integer shangAnVerify(Long couponOrderId,TenantEntity tenantinfo); - int findCount(WxCouponOrder wxCouponOrder,List tenantEntitys); + int findCount(WxCouponOrder wxCouponOrder); void statisticsWriteOff(WxCouponOrder wxCouponOrder, Map resultMap); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 52fbcc45d..1cd411693 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -129,4 +129,6 @@ public interface WxRentContractService { Map findRentByShop(Long shopId); Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId,String shopNumber); + + long findCount(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 8774463a4..3a15e6c38 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -31,6 +31,8 @@ public interface WxShopService { PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); PageInfo> notRentListMapAsPage(WxShop record,Integer pageIndex,Integer pageSize); + + long findCount(WxShop wxShop); List findListWithMerchantMap(WxShop record); @@ -101,5 +103,5 @@ public interface WxShopService { */ Map> findMerchantShopVoListMap(TenantEntity tenantEntity, List merchantIds); List findMerchantShopVoList(TenantEntity tenantEntity,Long merchantId); - + } 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 385c6a807..78da4b71e 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 @@ -19,6 +19,7 @@ import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.TtCUserMapper; +import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; @@ -53,7 +54,10 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer private WxAppinfoService wxAppinfoService; @Autowired - TtCUserMapper ttCUserMapper; + private TtCUserMapper ttCUserMapper; + + @Autowired + private WxMallMapper wxMallMapper; @Autowired MaUtil maUtil; @@ -302,6 +306,16 @@ 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 a378473d5..a0f61a963 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 @@ -15,6 +15,7 @@ import com.iformall.domain.vo.UserStructureVo; import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumYesOrNo; +import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; @@ -60,6 +61,9 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Autowired private WxCUserMapper wxCUserMapper; + @Autowired + private WxMallMapper wxMallMapper; + @Autowired MaUtil maUtil; @@ -310,6 +314,16 @@ 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/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 414af9915..df708fb0e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -13,10 +13,7 @@ import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; -import com.iformall.service.DataTowerService; -import com.iformall.service.WxCUserCarService; -import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponOrderService; +import com.iformall.service.*; import com.iformall.sms.wiwide.WiwideEntry; import com.iformall.sms.wiwide.WiwideSercret; import com.iformall.sms.wiwide.WiwideUtil; @@ -43,7 +40,7 @@ public class DataTowerServiceImpl implements DataTowerService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - WxShopMapper wxShopMapper; + WxShopService wxShopService; @Autowired WxMerchantMapper wxMerchantMapper; @@ -67,7 +64,7 @@ public class DataTowerServiceImpl implements DataTowerService { WxCouponChannelMapper wxCouponChannelMapper; @Autowired - WxRentContractMapper wxRentContractMapper; + WxRentContractService wxRentContractService; @Autowired WxBillAllMapper wxBillAllMapper; @@ -84,6 +81,9 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired private WxMallMapper wxMallMapper; + @Autowired + private WxChartDataMapper wxChartDataMapper; + @Autowired private WxCouponOrderService wxCouponOrderService; @@ -100,14 +100,12 @@ public class DataTowerServiceImpl implements DataTowerService { WxShop wxShop = new WxShop(); wxShop.updateTenantInfo(tenantEntity); wxShop.setStatus(EnumShopStatus.RENT.getCode()); - List rentedList = wxShopMapper.findList(wxShop); + long rentedCount = wxShopService.findCount(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); - List unrentedList = wxShopMapper.findList(wxShop); + long unrentedCount = wxShopService.findCount(wxShop); HashMap shopMap = new HashMap<>(); - int rentedCount = rentedList.size(); - int unrentedCount = unrentedList.size(); - int total = rentedCount + unrentedCount; + long total = rentedCount + unrentedCount; if (total == 0) { shopMap.put("rentedCount", 0); shopMap.put("unrentedCount", 0); @@ -198,68 +196,18 @@ public class DataTowerServiceImpl implements DataTowerService { } - //今日车流量*********************************************** + //昨日车流量*********************************************** private Map carRunning(TenantEntity tenantEntity) { - HashMap carMap = new HashMap<>(); -// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - HashMap paramsCar = new HashMap<>(); -// paramsCar.put("tenantEntitys",tenantEntitys); - paramsCar.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - paramsCar.put("parentTenantId", tenantEntity.getParentTenantId()); - } - paramsCar.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); - String startdate = DateUtils.getTimeBefore(30, new Date()); - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); - - List tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); - - paramsCar.put("startdate", startdate + " 00:00:00"); - paramsCar.put("enddate", systemTime + " 23:59:59"); - - List> historylist = wxCarCmdLogMapper.queryHistory(paramsCar); - - Map collect = historylist.stream().collect(Collectors.toMap(m -> { - return m.get("create_date"); - }, m -> { - return m.get("carcount"); - })); - - TreeMap historymap = new TreeMap<>(); - for (String date : tjTimeList) { - Object o = collect.get(date); - if (o == null) { - historymap.put(date.substring(5).replace("-", "/"), 0L); - } else { - historymap.put(date.substring(5).replace("-", "/"), o); - } - } - - long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); - carMap.put("carCount", todaycar); - - //环比 - String yesterday = DateUtils.getTimeBefore(1, new Date()); - long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/")); - if (yesterdaycar > 0) { - double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100; - double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - carMap.put("increasedPercent", hb+"%"); - } else { - carMap.put("increasedPercent", "--"); - } - - //上周同期 - String lastweek = DateUtils.getTimeBefore(7, new Date()); - long last = (long) historymap.get(lastweek.substring(5).replace("-", "/")); - if (last > 0) { - double lasthbd = (double) (todaycar - last) / last * 100; - double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - carMap.put("increasedPercentWeek", lasthb+"%"); - } else { - carMap.put("increasedPercentWeek", "--"); - } + WxChartDataEntity chartDataQ = new WxChartDataEntity(); + chartDataQ.updateTenantInfo(tenantEntity); + chartDataQ.setType(EnumChartType.CAR_OUT.getCode()); + //昨日 + String date = DateUtils.getTimeBefore(1, new Date()); + chartDataQ.setQuerytime(DateUtils.stringToDate(date)); + WxChartDataEntity wxChartDataEntity = wxChartDataMapper.selectOne(new QueryWrapper<>(chartDataQ)); + HashMap carMap = new HashMap<>(); + carMap.put("carCount", wxChartDataEntity==null?0:wxChartDataEntity.getResult()); return carMap; } @@ -277,20 +225,19 @@ public class DataTowerServiceImpl implements DataTowerService { cal.add(Calendar.DAY_OF_YEAR, 1); Date endTime = cal.getTime(); - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - //wxCouponOrder.updateTenantInfo(tenantEntity); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - long orderedCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + long orderedCount = wxCouponOrderService.findCount(wxCouponOrder); wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); - long verifiedCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + long verifiedCount = wxCouponOrderService.findCount(wxCouponOrder); couponMap.put("verifiedCount", verifiedCount); couponMap.put("orderedCount", orderedCount); WxCouponChannel wxCouponChannel = new WxCouponChannel(); -// wxCouponChannel.updateTenantInfo(tenantEntity); + wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - long couponCount = wxCouponChannelService.countCoupon(wxCouponChannel,tenantEntitys); + long couponCount = wxCouponChannelService.countCoupon(wxCouponChannel); couponMap.put("couponCount", couponCount); return couponMap; @@ -316,22 +263,22 @@ public class DataTowerServiceImpl implements DataTowerService { //wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); //int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); //contractMap.put("waitSignCount", waitSignCount); - contractMap.put("waitSignCount", 0); + //contractMap.put("waitSignCount", 0); //计租中 wxRentContract.setStatus(EnumRentContractStatus.PAING.getCode()); - int rendPaidCount = wxRentContractMapper.queryRentContractCountByStatus(wxRentContract); + long rendPaidCount = wxRentContractService.findCount(wxRentContract); contractMap.put("rendPaidCount", rendPaidCount); //将到期 //wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_END_SOON.getCode()); //int endSoonCount = wxRentContractMapper.queryRentContractEndSoonStatus(wxRentContract); //contractMap.put("endSoonCount", endSoonCount); - contractMap.put("endSoonCount", 0); + //contractMap.put("endSoonCount", 0); //到期 wxRentContract.setStatus(EnumRentContractStatus.OUT_DATE.getCode()); - int endCount = wxRentContractMapper.queryRentContractCountByStatus(wxRentContract); + long endCount = wxRentContractService.findCount(wxRentContract); contractMap.put("endCount", endCount); return contractMap; @@ -345,15 +292,9 @@ public class DataTowerServiceImpl implements DataTowerService { wxMsgConfig.updateTenantInfo(tenantEntity); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); - long usedCount = 0; - long remainsCount = 0; - long totalCount = 0; - if (wxMsgConfigs.size() > 0) { - wxMsgConfig = wxMsgConfigs.get(0); - totalCount = wxMsgConfig.getTotal(); - remainsCount = wxMsgConfig.getRemains(); - usedCount = totalCount - remainsCount; - } + long totalCount = wxMsgConfigs.stream().map(mc -> mc.getTotal()).reduce(Long::sum).get(); + long remainsCount = wxMsgConfigs.stream().map(mc -> mc.getRemains()).reduce(Long::sum).get(); + long usedCount = totalCount - remainsCount; messageMap.put("usedCount", usedCount); messageMap.put("totalCount", totalCount); @@ -422,128 +363,104 @@ public class DataTowerServiceImpl implements DataTowerService { } - @Override - public Map queryRunning(TenantEntity tenantEntity) { - WxShop wxShop = new WxShop(); - wxShop.updateTenantInfo(tenantEntity); - wxShop.setStatus(EnumShopStatus.RENT.getCode()); - List yczlist = wxShopMapper.findList(wxShop); - wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); - List wczlist = wxShopMapper.findList(wxShop); - - //出租与未出租 - HashMap datamap = new HashMap<>(); - int yczsize = yczlist.size(); - int wczsize = wczlist.size(); - int size = yczsize + wczsize; - if (size == 0) { - datamap.put("yczsl", 0); - datamap.put("wczsl", 0); - datamap.put("yczl", 0); - datamap.put("wczl", 0); - } else { - datamap.put("yczsl", yczsize); - datamap.put("wczsl", wczsize); - double yczld = ((double) yczsize / size) * 100; - double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - double wczld = ((double) wczsize / size) * 100; - double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("yczl", dczl); - datamap.put("wczl", wczl); - } - - //租金 - Map params = new HashMap<>(); - params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", tenantEntity.getParentTenantId()); - } - Calendar instance = Calendar.getInstance(); - instance.set(Calendar.DAY_OF_YEAR, 1); - instance.set(Calendar.HOUR_OF_DAY, 0); - instance.set(Calendar.MINUTE, 0); - instance.set(Calendar.SECOND, 0); - String startdate = DateUtils.date2String(instance); - instance.clear(); - String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); - params.put("startdate", startdate); - params.put("enddate", enddate); - Map payinfo = wxBillRentMapper.queryPayInfo(params); - if (payinfo != null) { - BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); - BigDecimal pay = (BigDecimal) payinfo.get("pay"); - if (receivepay.doubleValue() > 0) { - BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); - double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); - datamap.put("ysje", receivepay); - datamap.put("ssje", pay); - datamap.put("zjsjl", zjcjl); - } else { - datamap.put("ysje", 0); - datamap.put("ssje", 0); - datamap.put("zjsjl", 0); - } - } else { - datamap.put("ysje", 0); - datamap.put("ssje", 0); - datamap.put("zjsjl", 0); - } - - //上报 - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.updateTenantInfo(tenantEntity); - wxMerchant.setStatus(1); - List merchants = wxMerchantMapper.findList(wxMerchant); - - WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.updateTenantInfo(tenantEntity); - String reportdate = DateUtils.getTimeBefore(1, new Date()); - wxMerchantTradeDaily.setReportDate(reportdate); - List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); - int merchantsize = merchants.size(); - int tradesize = tradelist.size(); - if (merchantsize > 0 && tradesize > 0) { - double shsbld = ((double) tradesize / merchantsize) * 100; - double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("shsbl", shsbl); - } else { - datamap.put("shsbl", 0); - } - - int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum(); - datamap.put("shsbjg", shsbjg); - - return datamap; - } +// @Override +// public Map queryRunning(TenantEntity tenantEntity) { +// WxShop wxShop = new WxShop(); +// wxShop.updateTenantInfo(tenantEntity); +// wxShop.setStatus(EnumShopStatus.RENT.getCode()); +// List yczlist = wxShopMapper.findList(wxShop); +// wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); +// List wczlist = wxShopMapper.findList(wxShop); +// +// //出租与未出租 +// HashMap datamap = new HashMap<>(); +// int yczsize = yczlist.size(); +// int wczsize = wczlist.size(); +// int size = yczsize + wczsize; +// if (size == 0) { +// datamap.put("yczsl", 0); +// datamap.put("wczsl", 0); +// datamap.put("yczl", 0); +// datamap.put("wczl", 0); +// } else { +// datamap.put("yczsl", yczsize); +// datamap.put("wczsl", wczsize); +// double yczld = ((double) yczsize / size) * 100; +// double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); +// double wczld = ((double) wczsize / size) * 100; +// double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); +// datamap.put("yczl", dczl); +// datamap.put("wczl", wczl); +// } +// +// //租金 +// Map params = new HashMap<>(); +// params.put("tenantId", tenantEntity.getTenantId()); +// if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { +// params.put("parentTenantId", tenantEntity.getParentTenantId()); +// } +// Calendar instance = Calendar.getInstance(); +// instance.set(Calendar.DAY_OF_YEAR, 1); +// instance.set(Calendar.HOUR_OF_DAY, 0); +// instance.set(Calendar.MINUTE, 0); +// instance.set(Calendar.SECOND, 0); +// String startdate = DateUtils.date2String(instance); +// instance.clear(); +// String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); +// params.put("startdate", startdate); +// params.put("enddate", enddate); +// Map payinfo = wxBillRentMapper.queryPayInfo(params); +// if (payinfo != null) { +// BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); +// BigDecimal pay = (BigDecimal) payinfo.get("pay"); +// if (receivepay.doubleValue() > 0) { +// BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); +// double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); +// datamap.put("ysje", receivepay); +// datamap.put("ssje", pay); +// datamap.put("zjsjl", zjcjl); +// } else { +// datamap.put("ysje", 0); +// datamap.put("ssje", 0); +// datamap.put("zjsjl", 0); +// } +// } else { +// datamap.put("ysje", 0); +// datamap.put("ssje", 0); +// datamap.put("zjsjl", 0); +// } +// +// //上报 +// WxMerchant wxMerchant = new WxMerchant(); +// wxMerchant.updateTenantInfo(tenantEntity); +// wxMerchant.setStatus(1); +// List merchants = wxMerchantMapper.findList(wxMerchant); +// +// WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); +// wxMerchantTradeDaily.updateTenantInfo(tenantEntity); +// String reportdate = DateUtils.getTimeBefore(1, new Date()); +// wxMerchantTradeDaily.setReportDate(reportdate); +// List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); +// int merchantsize = merchants.size(); +// int tradesize = tradelist.size(); +// if (merchantsize > 0 && tradesize > 0) { +// double shsbld = ((double) tradesize / merchantsize) * 100; +// double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); +// datamap.put("shsbl", shsbl); +// } else { +// datamap.put("shsbl", 0); +// } +// +// int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum(); +// datamap.put("shsbjg", shsbjg); +// +// return datamap; +// } //出租率 @Override public Map queryOccupancyRate(TenantEntity tenantEntity) { - WxShop wxShop = new WxShop(); - wxShop.updateTenantInfo(tenantEntity); - wxShop.setStatus(EnumShopStatus.RENT.getCode()); - Integer yczsize = wxShopMapper.selectCount(new QueryWrapper<>(wxShop)); - wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); - Integer wczsize = wxShopMapper.selectCount(new QueryWrapper<>(wxShop)); - - HashMap datamap = new HashMap<>(); - int size = yczsize + wczsize; - if (size == 0) { - datamap.put("yczsl", 0); - datamap.put("wczsl", 0); - datamap.put("yczl", 0); - datamap.put("wczl", 0); - } else { - datamap.put("yczsl", yczsize); - datamap.put("wczsl", wczsize); - double yczld = ((double) yczsize / size) * 100; - double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - double wczld = ((double) wczsize / size) * 100; - double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("yczl", dczl); - datamap.put("wczl", wczl); - } - return datamap; + return shopRunning(tenantEntity); } //租金收缴率 @@ -611,29 +528,21 @@ public class DataTowerServiceImpl implements DataTowerService { @Override public Map queryCar(TenantEntity tenantEntity) { logger.info("停车-月统计-开始"); - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - - HashMap params = new HashMap<>(); - params.put("tenantEntitys",tenantEntitys); - params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", tenantEntity.getParentTenantId()); - } - params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); String startdate = DateUtils.getTimeBefore(30, new Date()); - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); - - List tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); - - params.put("startdate", startdate + " 00:00:00"); - params.put("enddate", systemTime + " 23:59:59"); - - List> historylist = wxCarCmdLogMapper.queryHistory(params); - - Map collect = historylist.stream().collect(Collectors.toMap(m -> { - return m.get("create_date"); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); + + List tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); + + WxChartDataEntity chartData = new WxChartDataEntity(); + chartData.updateTenantInfo(tenantEntity); + chartData.setType(EnumChartType.CAR_IN.getCode()); + chartData.setStartTime(DateUtils.stringToDate(startdate)); + chartData.setEndTime(DateUtils.stringToDate(enddate)); + List list = wxChartDataMapper.findList(chartData); + Map collect = list.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { - return m.get("carcount"); + return m.getResult(); })); Map historymap = new LinkedHashMap<>(); @@ -651,30 +560,29 @@ public class DataTowerServiceImpl implements DataTowerService { // 查询近一周的缴费车辆----start------ logger.info("停车-查询近一周的缴费车辆-开始"); - 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()); + chartData.setType(EnumChartType.CAR_PAID.getCode()); + chartData.setStartTime(DateUtils.stringToDate(oneWeekStartdate)); + chartData.setEndTime(DateUtils.stringToDate(oneWeekEndDate)); + List list1 = wxChartDataMapper.findList(chartData); + Map collect1 = list1.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); + }, m -> { + return m.getResult(); + })); - datamap.put("oneWeekCarPayCount",wxCarCmdLogMapper.queryWeekCarPayCount(weekParams)); + datamap.put("oneWeekCarPayCount",collect1); logger.info("停车-查询近一周的缴费车辆-结束"); // 近一周缴费金额 logger.info("停车-查询近一周的缴费金额-开始"); - weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); - List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); - Map weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { - return (String)m.get("create_time"); + chartData.setType(EnumChartType.CAR_PAY_FEE.getCode()); + List list2 = wxChartDataMapper.findList(chartData); + Map weekCollect = list2.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { - return m.get("fee"); + return m.getResult(); })); List days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0"); @@ -693,11 +601,12 @@ public class DataTowerServiceImpl implements DataTowerService { // 近一周新增会员历史 logger.info("停车-近一周新增会员历史-开始"); - List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams); - Map weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> { - return (String)m.get("create_time"); + chartData.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); + List list3 = wxChartDataMapper.findList(chartData); + Map weekCarCollect = list2.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { - return m.get("count"); + return m.getResult(); })); TreeMap weekCarMap = new TreeMap<>(); for (String date:days) { @@ -765,66 +674,69 @@ public class DataTowerServiceImpl implements DataTowerService { } logger.info("停车-上周同期-结束"); - // 今日 - logger.info("停车-今日停车数据-开始"); - params.put("startdate", systemTime + " 05:00:00"); - params.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); + - List> todayCarlist = wxCarCmdLogMapper.queryTodayCar(params); - Map todaycollect = todayCarlist.stream().collect(Collectors.toMap(m -> { - return m.get("create_time"); - }, m -> { - return m.get("carcount"); - })); - - Calendar instance = Calendar.getInstance(); - instance.add(Calendar.HOUR_OF_DAY, 1); - int hour = instance.get(Calendar.HOUR_OF_DAY); - TreeMap hourMap = new TreeMap<>(); - int startHour = 6; - int endHour = 24; - for (int i = startHour; i < endHour; i++) { - if (i <= hour) { - hourMap.put(i < 10 ? "0" + i + ":00" : i + ":00", 0); - } else { - hourMap.put(i < 10 ? "0" + i + ":00" : i + ":00", ""); - } - } - hourMap.putAll(todaycollect); - - datamap.put("todaycardata", hourMap); - logger.info("停车-今日停车数据-结束"); - - // 昨日 - logger.info("停车-昨日停车数据-开始"); - params.put("startdate", yesterday + " 05:00:00"); - params.put("enddate", yesterday + " 22:59:59"); - List> yesterdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); - Map yesterdaycollect = yesterdayCarlist.stream().collect(Collectors.toMap(m -> { - return m.get("create_time"); - }, m -> { - return m.get("carcount"); - })); - TreeMap yesterdaytreemap = getTimeTreeMap(); - yesterdaytreemap.putAll(yesterdaycollect); - - datamap.put("yesterdaycardata", yesterdaytreemap); - logger.info("停车-昨日停车数据-结束"); - - // 上周同期 - logger.info("停车-上周同期停车数据-开始"); - params.put("startdate", lastweek + " 05:00:00"); - params.put("enddate", lastweek + " 22:59:59"); - List> lastweekCarlist = wxCarCmdLogMapper.queryTodayCar(params); - Map lastweekcollect = lastweekCarlist.stream().collect(Collectors.toMap(m -> { - return m.get("create_time"); - }, m -> { - return m.get("carcount"); - })); - TreeMap lastweektreemap = getTimeTreeMap(); - lastweektreemap.putAll(lastweekcollect); - datamap.put("lastdaycardata", lastweektreemap); - logger.info("停车-上周同期停车数据-结束"); + // 今日 +// logger.info("停车-今日停车数据-开始"); +// params.put("startdate", systemTime + " 05:00:00"); +// params.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); +// +// List> todayCarlist = wxCarCmdLogMapper.queryTodayCar(params); +// Map todaycollect = todayCarlist.stream().collect(Collectors.toMap(m -> { +// return m.get("create_time"); +// }, m -> { +// return m.get("carcount"); +// })); +// +// Calendar instance = Calendar.getInstance(); +// instance.add(Calendar.HOUR_OF_DAY, 1); +// int hour = instance.get(Calendar.HOUR_OF_DAY); +// TreeMap hourMap = new TreeMap<>(); +// int startHour = 6; +// int endHour = 24; +// for (int i = startHour; i < endHour; i++) { +// if (i <= hour) { +// hourMap.put(i < 10 ? "0" + i + ":00" : i + ":00", 0); +// } else { +// hourMap.put(i < 10 ? "0" + i + ":00" : i + ":00", ""); +// } +// } +// hourMap.putAll(todaycollect); +// +// datamap.put("todaycardata", hourMap); +// logger.info("停车-今日停车数据-结束"); +// +// +// // 昨日 +// logger.info("停车-昨日停车数据-开始"); +// params.put("startdate", yesterday + " 05:00:00"); +// params.put("enddate", yesterday + " 22:59:59"); +// List> yesterdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); +// Map yesterdaycollect = yesterdayCarlist.stream().collect(Collectors.toMap(m -> { +// return m.get("create_time"); +// }, m -> { +// return m.get("carcount"); +// })); +// TreeMap yesterdaytreemap = getTimeTreeMap(); +// yesterdaytreemap.putAll(yesterdaycollect); +// +// datamap.put("yesterdaycardata", yesterdaytreemap); +// logger.info("停车-昨日停车数据-结束"); +// +// // 上周同期 +// logger.info("停车-上周同期停车数据-开始"); +// params.put("startdate", lastweek + " 05:00:00"); +// params.put("enddate", lastweek + " 22:59:59"); +// List> lastweekCarlist = wxCarCmdLogMapper.queryTodayCar(params); +// Map lastweekcollect = lastweekCarlist.stream().collect(Collectors.toMap(m -> { +// return m.get("create_time"); +// }, m -> { +// return m.get("carcount"); +// })); +// TreeMap lastweektreemap = getTimeTreeMap(); +// lastweektreemap.putAll(lastweekcollect); +// datamap.put("lastdaycardata", lastweektreemap); +// logger.info("停车-上周同期停车数据-结束"); //绑定车牌 logger.info("停车-绑定车牌-开始"); 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 9b45ff6a6..02d60f0e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -95,20 +95,18 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //取的当月券数据 @Override public Map getCouponData(TenantEntity tenantEntity) { - - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); - int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder); wxCouponOrder.setStartTime(addDay(-1)); wxCouponOrder.setEndTime(addDay(0)); - int yesterdayCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int yesterdayCount = wxCouponOrderService.findCount(wxCouponOrder); wxCouponOrder.setStartTime(addDay(-7)); wxCouponOrder.setEndTime(addDay(-6)); - int lastWeekCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int lastWeekCount = wxCouponOrderService.findCount(wxCouponOrder); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 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 0d35cb2ae..66b8a8053 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -92,6 +92,8 @@ public class WxChartServiceImpl implements WxChartDataService { WxBillOtherMapper wxBillOtherMapper; @Autowired WxBillAllMapper wxBillAllMapper; + @Autowired + WxChartDataMapper wxChartDataMapper; @Lazy @Autowired @@ -922,33 +924,22 @@ public class WxChartServiceImpl implements WxChartDataService { * @return */ private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { - String startdate; HashMap datamap = new HashMap<>(); - HashMap params = new HashMap<>(); - params.put("tenantId", tenantEntity.getTenantId()); - if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { - params.put("parentTenantId", tenantEntity.getParentTenantId()); - } - params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); - startdate = DateUtils.getTimeBefore(30, new Date()); - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); - - List tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); - - params.put("startdate", startdate + " 00:00:00"); - params.put("enddate", systemTime + " 23:59:59"); - - List> historylist = wxCarCmdLogMapper.queryHistory(params); - if (true) { - return new ResultData(); - } - - Map collect = historylist.stream().collect(Collectors.toMap(m -> { - return m.get("create_date"); + String startdate = DateUtils.getTimeBefore(30, new Date()); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); + + WxChartDataEntity chartData = new WxChartDataEntity(); + chartData.updateTenantInfo(tenantEntity); + chartData.setType(EnumChartType.CAR_IN.getCode()); + chartData.setStartTime(DateUtils.stringToDate(startdate)); + chartData.setEndTime(DateUtils.stringToDate(enddate)); + List list = wxChartDataMapper.findList(chartData); + Map collect = list.stream().collect(Collectors.toMap(m -> { + return new SimpleDateFormat("yyyy-MM-dd").format(m.getQuerytime()); }, m -> { - return m.get("carcount"); + return m.getResult(); })); - + List tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); List timeList = new ArrayList<>(); List valList = new ArrayList<>(); for (String date : tjTimeList) { @@ -1015,8 +1006,8 @@ public class WxChartServiceImpl implements WxChartDataService { 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()); - datamap.put("oneWeekCarPayCount", wxCarCmdLogMapper.queryWeekCarPayCount(weekParams)); + weekParams.put("cmdTypes", EnumCarCmd.getCarPay()); + datamap.put("oneWeekCarPayCount", wxCarCmdLogMapper.queryHistoryCount(weekParams)); return new ResultData(datamap); } @@ -1183,20 +1174,19 @@ public class WxChartServiceImpl implements WxChartDataService { */ private ResultData getTodayCouponCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); -// wxCouponOrder.updateTenantInfo(tenantEntity); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); - int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int todayCouponCount = wxCouponOrderService.findCount(wxCouponOrder); wxCouponOrder.setStartTime(addDay(-1)); wxCouponOrder.setEndTime( addDay(0)); - int yesterdayCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int yesterdayCount = wxCouponOrderService.findCount(wxCouponOrder); wxCouponOrder.setStartTime(addDay(-7)); wxCouponOrder.setEndTime( addDay(-6)); - int lastWeekCount = wxCouponOrderService.findCount(wxCouponOrder,tenantEntitys); + int lastWeekCount = wxCouponOrderService.findCount(wxCouponOrder); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 String couponUpDay = "--"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 9fa0a296a..ec5fa4eb9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -301,14 +301,18 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } @Override - public int countCoupon(WxCouponChannel wxCouponChannel, List tenantEntitys) { - int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponChannel.updateTenantInfo(tenantEntity); - int count1 = wxCouponChannelMapper.countCoupon(wxCouponChannel); - count += count1; + public int countCoupon(WxCouponChannel wxCouponChannel) { + if(StringUtils.isBlank(wxCouponChannel.getTenantId()) + && StringUtils.isNotBlank(wxCouponChannel.getParentTenantId())){ + List tenantEntitys = wxMallMapper.getTenantEntitys(wxCouponChannel); + int count = 0; + for (TenantEntity tenantEntity:tenantEntitys) { + wxCouponChannel.updateTenantInfo(tenantEntity); + count += wxCouponChannelMapper.countCoupon(wxCouponChannel); + } + return count; } - return count; + return wxCouponChannelMapper.countCoupon(wxCouponChannel); } /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 00de687ba..40273ca6d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2724,14 +2724,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return 0; } - public int findCount(WxCouponOrder wxCouponOrder,List tenantEntitys){ - int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponOrder.updateTenantInfo(tenantEntity); - int count1 = wxCouponOrderMapper.findCount(wxCouponOrder); - count += count1; - } - return count; + public int findCount(WxCouponOrder wxCouponOrder){ + if(StringUtils.isBlank(wxCouponOrder.getTenantId()) + && StringUtils.isNotBlank(wxCouponOrder.getParentTenantId())){ + List tenantEntitys = wxMallMapper.getTenantEntitys(wxCouponOrder); + int count = 0; + for (TenantEntity tenantEntity:tenantEntitys) { + wxCouponOrder.updateTenantInfo(tenantEntity); + count += wxCouponOrderMapper.findCount(wxCouponOrder); + } + return count; + } + return wxCouponOrderMapper.findCount(wxCouponOrder); } @Override 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 fc0a5e5e8..6e1ffa282 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -247,6 +247,11 @@ public class WxMallServiceImpl implements WxMallService { return wxMallMapper.listAsSelectMall(id); } + /** + * 根据parentTenantId获取子广场列表 + * @param tenantEntity + * @return + */ @Override public List getTenantEntitys(TenantEntity tenantEntity) { return wxMallMapper.getTenantEntitys(tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 345b36c88..d5485fa7a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3247,6 +3247,21 @@ public class WxRentContractServiceImpl implements WxRentContractService { return null; } + @Override + public long findCount(WxRentContract wxRentContract) { + if(StringUtils.isBlank(wxRentContract.getTenantId()) + && StringUtils.isNotBlank(wxRentContract.getParentTenantId())){ + List tenantEntitys = wxMallMapper.getTenantEntitys(wxRentContract); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + wxRentContract.updateTenantInfo(tenantEntity); + count += wxRentContractMapper.findCount(wxRentContract); + } + return count; + } + return wxRentContractMapper.findCount(wxRentContract); + } + public static void main(String[] args) { String s = "{\"siteMoney\":\"2\",\"facilityMoney\":\"3\",\"administratorMoney\":\"4\"}"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index abf88cd31..e98ae059b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -12,6 +12,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.iformall.mapper.*; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -42,10 +43,6 @@ import com.iformall.enums.EnumRentContractStatus; import com.iformall.enums.EnumRentShopType; import com.iformall.enums.EnumShopStatus; import com.iformall.enums.EnumUserAdmin; -import com.iformall.mapper.WxMerchantMapper; -import com.iformall.mapper.WxMerchantShopMapper; -import com.iformall.mapper.WxRentContractMapper; -import com.iformall.mapper.WxShopMapper; import com.iformall.service.ExcelService; import com.iformall.service.WxBrandService; import com.iformall.service.WxBusinessService; @@ -56,6 +53,9 @@ import com.iformall.service.WxShopService; @Service public class WxShopServiceImpl implements WxShopService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxMallMapper wxMallMapper; @Autowired WxShopMapper wxShopMapper; @@ -171,8 +171,23 @@ public class WxShopServiceImpl implements WxShopService { } return pageInfo; } - - private Map getMerchantMap(TenantEntity tenantEntity,List merchantIds,Map merchantMap) { + + @Override + public long findCount(WxShop wxShop) { + if(StringUtils.isBlank(wxShop.getTenantId()) + && StringUtils.isNotBlank(wxShop.getParentTenantId())){ + List tenantEntitys = wxMallMapper.getTenantEntitys(wxShop); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + wxShop.updateTenantInfo(tenantEntity); + count += wxShopMapper.findCount(wxShop); + } + return count; + } + return wxShopMapper.findCount(wxShop); + } + + private Map getMerchantMap(TenantEntity tenantEntity,List merchantIds,Map merchantMap) { if (null == merchantMap) { merchantMap = new HashMap(); } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 2aa2d6d97..89903a460 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -87,6 +87,22 @@ ) c group by c.create_date + + - + select sum(fee) fee + from wx_car_cmd_log + where cmd_type in + + #{cmdTypeItem} + and `tenant_id` = #{tenantId} and `parent_tenant_id` = #{parentTenantId} - and create_date BETWEEN #{startdate} and #{enddate} + and REPLACE (JSON_EXTRACT(cmd_json,'$.time'),'"','') BETWEEN #{startdate} and #{enddate} - - - - select `tenant_id`,`parent_tenant_id` from wx_mall where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - + select `tenant_id`,`parent_tenant_id` from wx_mall where `parent_tenant_id` = #{parentTenantId} - + select count(id) + from wx_rent_contract + where status=#{status} and `tenant_id` = #{tenantId} and `parent_tenant_id` = #{parentTenantId} - and rent_shop_type = #{rentShopType} + + and rent_shop_type = #{rentShopType} + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index c6c9d002f..e282df58f 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -150,6 +150,13 @@ + + + select + + from wx_chart_data + + + +