From 64bb759f898fb50782b4dd99ae48ceb9f14eba79 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 19 Apr 2022 14:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E5=AE=9E=E6=94=B6=E6=80=BB=E8=B4=B9=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/XhpcStatisticsServiceMapper.java | 2 - .../impl/XhpcStatisticsServiceImpl.java | 68 ++++++++++--------- .../resources/mapper/XhpcStatisticsMapper.xml | 7 ++ 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java index 59cf715c..e394c065 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java @@ -1,12 +1,10 @@ package com.xhpc.order.mapper; -import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.order.domain.XhpcStatisticsStation; import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import javax.persistence.criteria.CriteriaBuilder; import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index c7f39170..803bf273 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -1,8 +1,6 @@ package com.xhpc.order.service.impl; -import cn.hutool.Hutool; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; @@ -18,13 +16,12 @@ import com.xhpc.order.domain.XhpcStatisticsTimeInterval; import com.xhpc.order.mapper.XhpcStatisticsServiceMapper; import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcStatisticsService; - import com.xhpc.system.api.domain.SysUser; import com.xhpc.system.api.model.LoginUser; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -32,7 +29,6 @@ import java.io.IOException; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; - /** * @author yuyang * @date 2021/8/31 16:22 @@ -41,14 +37,14 @@ import java.util.*; @Service public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStatisticsService { - @Autowired - private XhpcStatisticsServiceMapper xhpcStatisticsServiceMapper; - @Autowired - private IXhpcHistoryOrderService xhpcHistoryOrderService; - @Autowired - private TokenService tokenService; - @Autowired - private RedisService redisService; + @Resource + XhpcStatisticsServiceMapper xhpcStatisticsServiceMapper; + @Resource + IXhpcHistoryOrderService xhpcHistoryOrderService; + @Resource + TokenService tokenService; + @Resource + RedisService redisService; @Override public List> getTimeIntervalPage(HttpServletRequest request,String chargingStationIds, Long internetUserId, Long operatorId, String startTime, String endTime, Long userId, Integer type) { @@ -566,15 +562,15 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); writer.addHeaderAlias("platformSvcCommisssion", "平台服务费抽成"); writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); - + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); // 一次性写出内容，使用默认样式，强制输出标题 @@ -631,15 +627,15 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); writer.addHeaderAlias("platformSvcCommisssion", "平台服务费抽成"); writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); - + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); // 一次性写出内容，使用默认样式，强制输出标题 @@ -703,8 +699,6 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); @@ -712,7 +706,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); writer.addHeaderAlias("createTime", "日期"); - + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); // 一次性写出内容，使用默认样式，强制输出标题 @@ -770,8 +766,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); + writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); @@ -779,6 +774,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); writer.addHeaderAlias("createTime", "日期"); + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); @@ -815,8 +813,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); + writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); @@ -824,7 +821,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); writer.addHeaderAlias("createTime", "日期"); - + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); // 一次性写出内容，使用默认样式，强制输出标题 @@ -875,8 +874,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); + writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); @@ -884,6 +882,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); writer.addHeaderAlias("createTime", "日期"); + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); @@ -943,8 +944,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("totalPrice", "订单总价"); writer.addHeaderAlias("promotionDiscount", "抵扣的总金额"); writer.addHeaderAlias("actPrice", "用户支付金额"); - writer.addHeaderAlias("actPowerPrice", "运营商电费"); - writer.addHeaderAlias("actServicePrice", "运营商服务费"); + writer.addHeaderAlias("internetCommission", "流量方总金额抽成"); writer.addHeaderAlias("internetSvcCommission", "流量方服务费抽成"); writer.addHeaderAlias("platformCommission", "平台总金额抽成"); @@ -952,6 +952,9 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati writer.addHeaderAlias("operationCommission", "运维总金额抽成"); writer.addHeaderAlias("operationSvcCommission", "运维服务费抽成"); writer.addHeaderAlias("createTime", "日期"); + writer.addHeaderAlias("actPowerPrice", "运营商实收电费"); + writer.addHeaderAlias("actServicePrice", "运营商实收服务费"); + writer.addHeaderAlias("actTotalPrice", "运营商实收总费用"); // 默认的，未添加alias的属性也会写出，如果想只写出加了别名的字段，可以调用此方法排除之 writer.setOnlyAlias(true); @@ -1091,7 +1094,8 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati String conditionBeginOfDay = null; String conditionEndOfDay = null; SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if(type==null || type ==1){ + if(type==null || type ==1){d: + conditionBeginOfDay = DateUtil.formatDateTime(DateUtil.offsetDay(beginOfDay, -30)); conditionEndOfDay = DateUtil.formatDateTime(endOfDay); }else if(type ==2){ diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index 50a17d5e..286e98db 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -41,6 +41,7 @@ format(sum(act_price), 2) actPrice, format(sum(act_power_price), 2) actPowerPrice, format(sum(act_service_price), 2) actServicePrice, + format(sum(act_service_price + act_power_price), 2) actTotalPrice, format(sum(charging_degree), 2) chargingDegree, format(sum(charging_time), 2) chargingTime, format(sum(charging_number), 2) chargingNumber, @@ -127,6 +128,7 @@ format(sum(platform_svc_commisssion), 2) platformSvcCommisssion, format(sum(operation_commission), 2) operationCommission, format(sum(operation_svc_commission), 2) operationSvcCommission, + format(sum(act_power_price + act_service_price), 2) actTotalPrice, DATE_FORMAT(create_time,'%Y-%m-%d') createTime from xhpc_statistics_station where del_flag=0 and type=1 @@ -166,6 +168,7 @@ format(sum(ss.act_price), 2) actPrice, format(sum(ss.act_power_price), 2) actPowerPrice, format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.act_service_price + ss.act_power_price), 2) actTotalPrice, format(sum(ss.promotion_discount), 2) promotionDiscount, format(sum(ss.internet_commission), 2) internetCommission, format(sum(ss.internet_svc_commission), 2) internetSvcCommission, @@ -222,6 +225,7 @@ format(sum(ss.act_price), 2) actPrice, format(sum(ss.act_power_price), 2) actPowerPrice, format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.act_service_price + ss.act_power_price), 2) actTotalPrice, format(sum(ss.promotion_discount), 2) promotionDiscount, format(sum(ss.internet_commission), 2) internetCommission, format(sum(ss.internet_svc_commission), 2) internetSvcCommission, @@ -315,6 +319,7 @@ format(sum(ss.act_price), 2) actPrice, format(sum(ss.act_power_price), 2) actPowerPrice, format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.act_service_price + ss.act_power_price), 2) actTotalPrice, format(sum(ss.promotion_discount), 2) promotionDiscount, format(sum(ss.internet_commission), 2) internetCommission, format(sum(ss.internet_svc_commission), 2) internetSvcCommission, @@ -431,6 +436,7 @@ format(sum(act_price), 2) actPrice, format(sum(act_power_price), 2) actPowerPrice, format(sum(act_service_price), 2) actServicePrice, + format(sum(act_service_price + act_power_price), 2) actTotalPrice, format(sum(promotion_discount), 2) promotionDiscount, format(sum(internet_commission), 2) internetCommission, format(sum(internet_svc_commission), 2) internetSvcCommission, @@ -881,6 +887,7 @@ format(sum(ss.act_price), 2) actPrice, format(sum(ss.act_power_price), 2) actPowerPrice, format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.act_service_price + ss.act_power_price), 2) actTotalPrice, format(sum(ss.promotion_discount), 2) promotionDiscount, format(sum(ss.internet_commission), 2) internetCommission, format(sum(ss.internet_svc_commission), 2) internetSvcCommission,