From c1fae25e9c7a51f4bdf8ddcb331ea1f6eb60a4fe Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 3 Mar 2022 18:33:35 +0800 Subject: [PATCH] =?UTF-8?q?/.=20=E6=8A=A5=E8=A1=A8-001.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserDataController.java | 7 ++-- .../iformall/schedule/ChartDataSchedule.java | 32 +++++++---------- .../com/iformall/mapper/WxCUserCarMapper.java | 2 +- .../iformall/service/WxCUserCarService.java | 10 ++++++ .../iformall/service/WxCarCmdLogService.java | 5 ++- .../service/WxCouponOrderService.java | 2 +- .../service/WxMerchantTradeDailyService.java | 3 +- .../cuser/tt/TtCUserServiceAdapter.java | 12 +++++-- .../cuser/wx/WxCUserServiceAdapter.java | 11 ++++-- .../service/impl/DataTowerServiceImpl.java | 8 ++--- .../service/impl/WxBillRentServiceImpl.java | 7 ++-- .../service/impl/WxCUserCarServiceImpl.java | 34 ++++++++++++++++-- .../service/impl/WxCarCmdLogServiceImpl.java | 35 +++++++++++++++++-- .../service/impl/WxChartServiceImpl.java | 19 ++++------ .../impl/WxCouponOrderServiceImpl.java | 16 ++++----- .../impl/WxMerchantTradeDailyServiceImpl.java | 12 +++++++ .../resources/mapper/WxCUserCarMapper.xml | 14 +++----- .../mapper/WxMerchantTradeDailyMapper.xml | 19 ++++------ 18 files changed, 162 insertions(+), 86 deletions(-) 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 e1b6dc91b..7f500df1b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -408,20 +408,19 @@ public class WxCUserDataController extends BaseController { c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); c.set(Calendar.SECOND, 0); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(c.getTime()); //今日消费金额 - int todayCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys); + int todayCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder); //周交易金额 c.add(Calendar.DAY_OF_YEAR, -7); wxCouponOrder.setStartTime(c.getTime()); - int weekCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys); + int weekCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder); //月交易金额 c.add(Calendar.DAY_OF_YEAR, -22); wxCouponOrder.setStartTime(c.getTime()); - int monthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys); + int monthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder); Map map = new HashMap<>(); DecimalFormat df = new DecimalFormat("0.00"); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index 5b775f439..979fec007 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -9,8 +9,7 @@ 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.*; import com.iformall.service.cuser.CUserServiceFactory; import com.iformall.utils.DateUtils; import org.apache.commons.lang3.StringUtils; @@ -25,7 +24,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author gongbiao @@ -36,7 +34,7 @@ public class ChartDataSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - WxCarCmdLogMapper wxCarCmdLogMapper; + WxCarCmdLogService wxCarCmdLogService; @Autowired WxMallMapper wxMallMapper; @@ -48,10 +46,10 @@ public class ChartDataSchedule { WxChartDataMapper wxChartDataMapper; @Autowired - WxCouponOrderMapper wxCouponOrderMapper; + WxCouponOrderService wxCouponOrderService; @Autowired - WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; + WxMerchantTradeDailyService wxMerchantTradeDailyService; @Autowired WxCUserCarService wxCUserCarService; @@ -64,10 +62,10 @@ public class ChartDataSchedule { /** - * 每天7点执行 + * 每天5点执行 */ @Async - @Scheduled(cron = "0 0 7 * * ?") + @Scheduled(cron = "0 0 5 * * ?") public void createData() { createUserData(); createCarData(); @@ -179,7 +177,7 @@ public class ChartDataSchedule { if (count == 0) { logger.info("入场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes",EnumCarCmd.getCarIn()); - Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); + Long carOutCount = wxCarCmdLogService.queryHistoryCount(params); addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_IN.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); @@ -187,7 +185,7 @@ public class ChartDataSchedule { if (count == 0) { logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes",EnumCarCmd.getCarOut()); - Long carOutCount = wxCarCmdLogMapper.queryHistoryCount(params); + Long carOutCount = wxCarCmdLogService.queryHistoryCount(params); addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); @@ -195,7 +193,7 @@ public class ChartDataSchedule { if (count == 0) { logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - Long carPayFeeCount = wxCarCmdLogMapper.queryHistoryCount(params); + Long carPayFeeCount = wxCarCmdLogService.queryHistoryCount(params); addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); } wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); @@ -203,7 +201,7 @@ public class ChartDataSchedule { if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); params.put("cmdTypes", EnumCarCmd.getCarPay()); - BigDecimal fee = wxCarCmdLogMapper.queryCarPay(params); + BigDecimal fee = wxCarCmdLogService.queryCarPay(params); addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } // wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); @@ -227,7 +225,7 @@ public class ChartDataSchedule { count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - Long todaybindcar = wxCUserCarMapper.queryCarCount(params); + Long todaybindcar = wxCUserCarService.queryCarCount(params); addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); } } @@ -263,7 +261,7 @@ public class ChartDataSchedule { wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startdate); wxCouponOrder.setEndTime(enddate); - Integer price = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); + Integer price = wxCouponOrderService.queryPriceTotal(wxCouponOrder); addChartData(tenantEntity, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime); } } @@ -297,11 +295,7 @@ public class ChartDataSchedule { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.updateTenantInfo(tenantEntity); wxMerchantTradeDaily.setReportDate(yesterday); - List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); - Integer price = 0; - if (!recordList.isEmpty()) { - price = Integer.parseInt(recordList.get(0).getTradeAmt()); - } + Integer price = wxMerchantTradeDailyService.findSumMoney(wxMerchantTradeDaily); addChartData(tenantEntity, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime); } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java index 8c34b650e..cbd39a1c0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java @@ -14,6 +14,6 @@ public interface WxCUserCarMapper extends CommonMapper { Integer countList(WxCUserCar wxCUserCar); Integer countUser(WxCUserBasicInfoDto dto); - long queryCarCount(Map carParams); + long queryCarCount(HashMap carParams); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java index 8749e43c2..6d882e5f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserCarService.java @@ -5,6 +5,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.base.TenantEntity; +import java.util.HashMap; import java.util.List; public interface WxCUserCarService { @@ -42,6 +43,7 @@ public interface WxCUserCarService { * @return */ Integer countUser(WxCUserBasicInfoDto dto); + /** * 根据实体查询 * @@ -100,5 +102,13 @@ public interface WxCUserCarService { */ void deleteByObj(WxCUserCar record); + /** + * 查询count + * + * @param + * @return + */ + long queryCarCount(HashMap params); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index 9c8af70b5..6dc86ae06 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCarCmdLog; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -56,5 +57,7 @@ public interface WxCarCmdLogService { Map getHourCountMap(WxCarCmdLog wxCarCmdLog); - long queryHistoryCount(HashMap weekParams); + long queryHistoryCount(HashMap params); + + BigDecimal queryCarPay(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 5b0e356f3..554abc34f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -173,7 +173,7 @@ public interface WxCouponOrderService { * 查询消费额 * @return */ - int queryPriceTotal(WxCouponOrder wxCouponOrder,List tenantEntitys); + int queryPriceTotal(WxCouponOrder wxCouponOrder); ////// ------- 卡 diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index a7a91a317..2794b006f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -45,7 +45,7 @@ public interface WxMerchantTradeDailyService { /** * 上传当日解单数据 * - * @param id + * @param userId * @param volume */ @@ -92,4 +92,5 @@ public interface WxMerchantTradeDailyService { ResultData summary(WxMerchantTradeDaily wxMerchantTradeDaily); + Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily); } 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 61aa26e6c..3115c0f00 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,10 +19,10 @@ 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; +import com.iformall.service.WxMallService; import com.iformall.service.cuser.BasicCUserService; import com.iformall.service.cuser.CUserServiceApapter; import com.iformall.utils.Constant; @@ -57,7 +57,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer private TtCUserMapper ttCUserMapper; @Autowired - private WxMallMapper wxMallMapper; + private WxMallService wxMallService; @Autowired MaUtil maUtil; @@ -306,7 +306,13 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - return ttCUserMapper.findCount(dto); + List tenantEntitys = wxMallService.getTenantEntitys(dto); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + dto.updateTenantInfo(tenantEntity); + count += ttCUserMapper.findCount(dto); + } + return count; } @Override 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 0d5ff2465..144e4b1b6 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 @@ -19,6 +19,7 @@ import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserTagsService; +import com.iformall.service.WxMallService; import com.iformall.service.cuser.BasicCUserService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; @@ -62,7 +63,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer private WxCUserMapper wxCUserMapper; @Autowired - private WxMallMapper wxMallMapper; + private WxMallService wxMallService; @Autowired MaUtil maUtil; @@ -314,7 +315,13 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer @Override public long findCount(WxCUserBasicInfoDto dto) { - return wxCUserMapper.findCount(dto); + List tenantEntitys = wxMallService.getTenantEntitys(dto); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + dto.updateTenantInfo(tenantEntity); + count += wxCUserMapper.findCount(dto); + } + return count; } @Override 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 cd50657a5..304fa7292 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -73,7 +73,7 @@ public class DataTowerServiceImpl implements DataTowerService { WxMsgConfigMapper wxMsgConfigMapper; @Autowired - WxCUserCarMapper wxCUserCarMapper; + WxCUserCarService wxCUserCarService; @Autowired StringRedisTemplate stringRedisTemplate; @@ -745,13 +745,13 @@ public class DataTowerServiceImpl implements DataTowerService { } 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); + long todaybindcar = wxCUserCarService.queryCarCount(carParams); carParams.put("startdate",yesterday+" 00:00:00"); carParams.put("enddate",yesterday+" 23:59:59"); - long yesterdaybindcar = wxCUserCarMapper.queryCarCount(carParams); + long yesterdaybindcar = wxCUserCarService.queryCarCount(carParams); carParams.put("startdate",lastweek+" 00:00:00"); carParams.put("enddate",lastweek+" 23:59:59"); - long lastweekbindcar = wxCUserCarMapper.queryCarCount(carParams); + long lastweekbindcar = wxCUserCarService.queryCarCount(carParams); datamap.put("todaybindcar",todaybindcar); if (yesterdaybindcar > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index a8c9b8b19..5d9e36369 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -53,7 +53,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Autowired WxRentContractMapper wxRentContractMapper; @Autowired - WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; + WxMerchantTradeDailyService wxMerchantTradeDailyService; @Autowired WxPayAccountBillService wxPayAccountBillService; @Autowired @@ -312,8 +312,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { merchantTradeDaily.setMerchantId(billRent.getMerchantId()); merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime())); merchantTradeDaily.setEndTime(sd.format(billRent.getEndtime())); - String money = wxMerchantTradeDailyMapper.findSumMoney(merchantTradeDaily); - result.put("solutionBillMoney", StringUtils.isBlank(money)?0:money); + Integer money = wxMerchantTradeDailyService.findSumMoney(merchantTradeDaily); + String moneyStr = new BigDecimal(money.toString()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); + result.put("solutionBillMoney", moneyStr); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index d15a513b3..def433ac6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxCUserCarMapper; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserCarService; +import com.iformall.service.WxMallService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -37,6 +39,9 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Autowired WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired + WxMallService wxMallService; + private void handlerUserParam(WxCUserCar record){ if(StringUtils.isNotBlank(record.getUserPhone())){ WxCUserBasicInfo biq = new WxCUserBasicInfo(); @@ -88,8 +93,13 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Override public Integer countUser(WxCUserBasicInfoDto dto) { - Integer integer = wxCUserCarMapper.countUser(dto); - return integer==null?0:integer; + List tenantEntitys = wxMallService.getTenantEntitys(dto); + int count = 0; + for (TenantEntity tenantEntity:tenantEntitys) { + dto.updateTenantInfo(tenantEntity); + count += wxCUserCarMapper.countUser(dto); + } + return count; } @Override @@ -147,5 +157,23 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { public void deleteByObj(WxCUserCar record) { wxCUserCarMapper.delete(new UpdateWrapper<>(record)); } - + + @Override + public long queryCarCount(HashMap params) { + + String tenantId = params.get("tenantId").toString(); + String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); + TenantEntity te = new TenantEntity(); + te.setTenantId(tenantId); + te.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(te); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); + count += wxCUserCarMapper.queryCarCount(params); + } + return count; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index 2fee55ff0..e8b5995d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -97,8 +98,38 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public long queryHistoryCount(HashMap weekParams) { - return wxCarCmdLogMapper.queryHistoryCount(weekParams); + public long queryHistoryCount(HashMap params) { + String tenantId = params.get("tenantId").toString(); + String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); + TenantEntity te = new TenantEntity(); + te.setTenantId(tenantId); + te.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(te); + long count = 0l; + for (TenantEntity tenantEntity:tenantEntitys) { + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); + count += wxCarCmdLogMapper.queryHistoryCount(params); + } + return count; + } + + @Override + public BigDecimal queryCarPay(HashMap params) { + String tenantId = params.get("tenantId").toString(); + String parentTenantId = params.get("parentTenantId") == null?null:params.get("parentTenantId").toString(); + TenantEntity te = new TenantEntity(); + te.setTenantId(tenantId); + te.setParentTenantId(parentTenantId); + List tenantEntitys = wxMallService.getTenantEntitys(te); + BigDecimal carPay = new BigDecimal(0); + for (TenantEntity tenantEntity:tenantEntitys) { + params.put("tenantId", tenantEntity.getTenantId()); + params.put("parentTenantId", tenantEntity.getParentTenantId()); + BigDecimal bigDecimal = wxCarCmdLogMapper.queryCarPay(params); + carPay.add(bigDecimal); + } + return carPay; } 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 ffad36e87..83c07ad41 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -63,7 +63,7 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired WxUserVisitMapper wxUserVisitMapper; @Autowired - WxCUserCarMapper wxCUserCarMapper; + WxCUserCarService wxCUserCarService; @Autowired WxCouponActionLogService wxCouponActionLogService; @Autowired @@ -128,10 +128,6 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired private WxCUserService wxCUserService; - @Lazy - @Autowired - private WxCUserCarService wxCUserCarService; - @Lazy @Autowired private WxShopService wxShopService; @@ -809,20 +805,20 @@ public class WxChartServiceImpl implements WxChartDataService { String yesterday = DateUtils.getTimeBefore(1, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date()); //绑定车牌 - Map carParams = new HashMap<>(); + HashMap carParams = new HashMap<>(); carParams.put("tenantId", tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { carParams.put("parentTenantId", tenantEntity.getParentTenantId()); } 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); + long todaybindcar = wxCUserCarService.queryCarCount(carParams); carParams.put("startdate", yesterday + " 00:00:00"); carParams.put("enddate", yesterday + " 23:59:59"); - long yesterdaybindcar = wxCUserCarMapper.queryCarCount(carParams); + long yesterdaybindcar = wxCUserCarService.queryCarCount(carParams); carParams.put("startdate", lastweek + " 00:00:00"); carParams.put("enddate", lastweek + " 23:59:59"); - long lastweekbindcar = wxCUserCarMapper.queryCarCount(carParams); + long lastweekbindcar = wxCUserCarService.queryCarCount(carParams); datamap.put("todaybindcar", todaybindcar); if (yesterdaybindcar > 0) { double yesterdaybinddhb = (double) (todaybindcar - yesterdaybindcar) / yesterdaybindcar * 100; @@ -1389,11 +1385,10 @@ public class WxChartServiceImpl implements WxChartDataService { Date endTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys);//月消费金额 + int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder);//月消费金额 c.clear(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1403,7 +1398,7 @@ public class WxChartServiceImpl implements WxChartDataService { wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); // wxCouponOrder.updateTenantInfo(tenantEntity); - int todayCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys);//月消费金额 + int todayCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder);//月消费金额 DecimalFormat df = new DecimalFormat("0.00"); datamap.put("todayCount", df.format((float) todayCount / 100));//今日消费金额 String thisMonthCountStr = df.format((float) thisMonthCount / 100); 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 9f708440e..c87175318 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2158,14 +2158,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public int queryPriceTotal(WxCouponOrder wxCouponOrder,List tenantEntitys) { - int count = 0; - for (TenantEntity tenantEntity:tenantEntitys) { - wxCouponOrder.updateTenantInfo(tenantEntity); - int i = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); - count += i; - } - return count; + public int queryPriceTotal(WxCouponOrder wxCouponOrder) { + int price = 0; + List tenantEntitys = wxMallService.getTenantEntitys(wxCouponOrder); + for (TenantEntity tenantEntity:tenantEntitys) { + wxCouponOrder.updateTenantInfo(tenantEntity); + price += wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); + } + return price; } private WxCardCVo findCardDetailOfCUser(Long id,String tenantId) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 3fbfde9ce..29a34dfe2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -204,6 +204,18 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return new ResultData(data); } + @Override + public Integer findSumMoney(WxMerchantTradeDaily merchantTradeDaily) { + List tenantEntitys = wxMallService.getTenantEntitys(merchantTradeDaily); + int money = 0; + for (TenantEntity tenantEntity:tenantEntitys) { + merchantTradeDaily.updateTenantInfo(tenantEntity); + String sumMoney = wxMerchantTradeDailyMapper.findSumMoney(merchantTradeDaily); + money += Integer.parseInt(sumMoney); + } + return money; + } + @Override public ResultData getVolumeOfMonth(Long merchantId) { diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index b006578a0..62517870d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -93,11 +93,9 @@