From 9b3e102d0d36768b146c047fa6d9075b52bb2345 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 8 Mar 2019 14:21:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9B=BE=E8=A1=A8=E6=95=B4=E5=90=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=94=80=E5=94=AE=E6=80=BB=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E9=A2=9D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/ChartDataSchedule.java | 43 +++++++++++++++---- .../com/iformall/enums/EnumChartType.java | 3 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index e9be33aa0..c61738136 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -5,10 +5,7 @@ import com.iformall.domain.po.WxChartDataEntity; import com.iformall.domain.po.WxMall; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumChartType; -import com.iformall.mapper.WxCUserCarMapper; -import com.iformall.mapper.WxCarCmdLogMapper; -import com.iformall.mapper.WxChartDataMapper; -import com.iformall.mapper.WxMallMapper; +import com.iformall.mapper.*; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,19 +39,22 @@ public class ChartDataSchedule { @Autowired WxChartDataMapper wxChartDataMapper; + @Autowired + WxCouponOrderMapper wxCouponOrderMapper; + /** - * 车相关数据 每天9点执行 + * 每天1点执行 */ @Scheduled(cron = "0 0 1 * * ?") - - public void createCarData() { - createCarPayFeeCountData(); + public void createData() { + createCarData(); + createSaleData(); } /** * 出场车辆、缴费车辆、缴费金额、新增会员、新增停车会员、已绑车辆 */ - public void createCarPayFeeCountData() { + public void createCarData() { HashMap params = new HashMap<>(); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); Date createtime = new Date(); @@ -79,6 +79,31 @@ public class ChartDataSchedule { carNewMemberData(createtime, date, tenantId); logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); carBindData(params, createtime, date, tenantId); + logger.info("销售数据-金额>>>>>>>>>>>>>>>>>>>>>>>"); + } + } + + /** + * 销售总交易额 + */ + public void createSaleData() { + HashMap params = new HashMap<>(); + Date createtime = new Date(); + String yesterday = DateUtils.getTimeBefore(1, createtime); + String today = DateUtils.getSystemTime("yyyy-MM-dd"); + + Date startdate = DateUtils.stringToDate(yesterday); + Date enddate = DateUtils.stringToDate(today); + + List wxMalls = wxMallMapper.findList(null); + for (WxMall wxMall : wxMalls) { + String tenantId = wxMall.getTenantId(); + params.put("tenantId", tenantId); + logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>"); + Integer price = wxCouponOrderMapper.queryPriceTotal(tenantId, startdate, enddate); + addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), enddate, createtime); + + } } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java index 44ed04d54..732b64947 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChartType.java @@ -9,7 +9,8 @@ public enum EnumChartType { CAR_PAY_FEE(3, "缴费金额"), CAR_MEMBER(4, "新增会员"), CAR_NEW_MEMBER(5, "新增停车会员"), - CAR_BIND(6, "已绑车辆"),; + CAR_BIND(6, "已绑车辆"), + SALE_COUPON_PRICE(7, "销售总交易额"),; public static EnumChartType getEnum(Integer code) { for (EnumChartType value : values()) { if (value.getCode().equals(code)) {