订单统计

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderMemberReceivedStatisticsSignEnum.java

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  * @data 2019/11/11 10:36
  */
 public enum  OrderMemberReceivedStatisticsSignEnum{
-    MEMBER_TOTAL_AMOUNT("mta","会员订单总额"){
+    MEMBER_TOTAL_AMOUNT("da_mta","会员订单总额"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object,List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -32,7 +32,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    COMMON__MEMBER_TOTAL_AMOUNT("cmta","普通会员订单总额"){
+    COMMON__MEMBER_TOTAL_AMOUNT("db_cmta","普通会员订单总额"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -48,7 +48,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    MEMBER_TOTAL_QUANTITY("cmtq","普通会员订单量"){
+    MEMBER_TOTAL_QUANTITY("dc_cmtq","普通会员订单量"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -64,7 +64,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    GOLD_MEMBER_TOTAL_AMOUNT("gmta","黄金会员订单总额"){
+    GOLD_MEMBER_TOTAL_AMOUNT("dd_gmta","黄金会员订单总额"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -80,7 +80,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    GOLD_MEMBER_TOTAL_QUANTITY("mgtq","黄金会员订单量"){
+    GOLD_MEMBER_TOTAL_QUANTITY("de_mgtq","黄金会员订单量"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -96,7 +96,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    DIAMOND_MEMBER_TOTAL_AMOUNT("dmta","钻石会员订单总额"){
+    DIAMOND_MEMBER_TOTAL_AMOUNT("df_dmta","钻石会员订单总额"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -112,7 +112,7 @@ public enum  OrderMemberReceivedStatisticsSignEnum{
             return resultMap;
         }
     },
-    DIAMOND_MEMBER_TOTAL_QUANTITY("dmtq","钻石会员订单量"){
+    DIAMOND_MEMBER_TOTAL_QUANTITY("dg_dmtq","钻石会员订单量"){
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderReceivedStatisticsSignEnum.java

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  * @data 2019/11/11 10:36
  */
 public enum  OrderReceivedStatisticsSignEnum {
-     ORDER_TOTAL_AMOUNT("ota","订单总额"){
+     ORDER_TOTAL_AMOUNT("aa_ota","订单总额"){
           @Override
           Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -32,7 +32,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                return resultMap;
           }
      },
-     ORDER_TOTAL_QUANTITY("otq","订单量"){
+     ORDER_TOTAL_QUANTITY("ab_otq","订单量"){
           @Override
           Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -48,7 +48,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                return resultMap;
           }
      },
-     ORDER_AVG_QUANTITY("oavgq","订单平均量"){
+     ORDER_AVG_QUANTITY("ac_oavgq","订单arpu"){
           @Override
           Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -64,7 +64,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                return resultMap;
           }
      },
-     ORDER_TOTAL_REAL_AMOUNT("otra","订单实际总额"){
+     ORDER_TOTAL_REAL_AMOUNT("ad_otra","实际收入"){
           @Override
           Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -80,7 +80,7 @@ public enum  OrderReceivedStatisticsSignEnum {
                return resultMap;
           }
      },
-     ORDER_REAL_AVG_AMOUNT("oravga","订单实际平均总额"){
+     ORDER_REAL_AVG_AMOUNT("ae_oravga","实际arpu"){
           @Override
           Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
                Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderRentVehicleReceivedStatisticsSignEnum.java

@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
  * @data 2019/11/11 10:36
  */
 public enum OrderRentVehicleReceivedStatisticsSignEnum{
-     RENT_VEHICLE_TOTAL_AMOUNT("rvta","租车订单总额"){
+     RENT_VEHICLE_TOTAL_AMOUNT("ba_rvta","租车订单总额"){
          @Override
          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -33,7 +33,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              return resultMap;
          }
      },
-     RENT_VEHICLE_TOTAL_QUANTITY("rvtq","租车订单量") {
+     RENT_VEHICLE_TOTAL_QUANTITY("bb_rvtq","租车订单量") {
          @Override
          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -49,7 +49,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              return resultMap;
          }
      },
-     RENT_VEHICLE_AVG_QUANTITY("rvavgq","租车订单平均量") {
+     RENT_VEHICLE_AVG_QUANTITY("bc_rvavgq","租车订单arpu") {
          @Override
          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -65,7 +65,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              return resultMap;
          }
      },
-     RENT_VEHICLE_REAL_TOTAL_AMOUNT("rvrta","实际租车金额") {
+     RENT_VEHICLE_REAL_TOTAL_AMOUNT("bd_rvrta","实际租车金额") {
          @Override
          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -81,7 +81,7 @@ public enum OrderRentVehicleReceivedStatisticsSignEnum{
              return resultMap;
          }
      },
-     RENT_VEHICLE_REAL_AVG_AMOUNT("rvravga","实际租车平均金额") {
+     RENT_VEHICLE_REAL_AVG_AMOUNT("be_rvravga","实际租车arpu") {
          @Override
          Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
              Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderTourReceivedStatisticsSignEnum.java

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  * @data 2019/11/11 10:36
  */
 public enum OrderTourReceivedStatisticsSignEnum {
-    TOUR_TOTAL_AMOUNT("tta", "旅游订单总额") {
+    TOUR_TOTAL_AMOUNT("ca_tta", "旅游订单总额") {
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -32,7 +32,7 @@ public enum OrderTourReceivedStatisticsSignEnum {
             return resultMap;
         }
     },
-    TOUR_TOTAL_QUANTITY("ttq", "旅游订单量") {
+    TOUR_TOTAL_QUANTITY("cb_ttq", "旅游订单量") {
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();
@@ -48,7 +48,7 @@ public enum OrderTourReceivedStatisticsSignEnum {
             return resultMap;
         }
     },
-    TOUR_AVG_QUANTITY("tavgq", "旅游订单平均量") {
+    TOUR_AVG_QUANTITY("cd_tavgq", "旅游订单arpu") {
         @Override
         Map<String, List<OrderReceivedStatisticsVo>> wrapToMap(Map<Object, List<OrderReceivedStatisticsBase>> orderMap) {
             Map<String, List<OrderReceivedStatisticsVo>> resultMap = new HashMap<>();

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/ReceivedStatisticsEnum.java

@@ -34,7 +34,7 @@ public enum ReceivedStatisticsEnum {
             if (CollectionUtils.isEmpty(orderReceivedStatisticsBases)) {
                 return Collections.EMPTY_MAP;
             }
-            return orderReceivedStatisticsBases.stream().peek(x -> ((OrderReceivedStatisticsBase) x).setDate(null)).collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getWeekOfYear, Collectors.toList()));
+            return orderReceivedStatisticsBases.stream().collect(Collectors.groupingBy(OrderReceivedStatisticsBase::getWeekOfYear, Collectors.toList()));
         }
     },
     MONTH(3, "按月统计") {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/OrderApplication.java

@@ -13,7 +13,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
         "com.github.wxiaoqi.security.common.handler",
-        "com.github.wxiaoqi.security.common.log"
+        "com.github.wxiaoqi.security.common.log",
+        "com.github.wxiaoqi.security.common.support"
 })
 @EnableDiscoveryClient
 @EnableScheduling

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderReceivedStatisticsAdminController.java

 package com.xxfc.platform.order.rest.background;
 
+import com.github.wxiaoqi.security.common.annotation.BeanValid;
 import com.github.wxiaoqi.security.common.annotation.SimpleValid;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.biz.OrderReceivedStatisticsBiz;
 import com.xxfc.platform.order.pojo.dto.OrderReceivedStatisticsFindDTO;
@@ -8,12 +10,18 @@ import com.xxfc.platform.order.pojo.vo.OrderReceivedStatisticsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +31,7 @@ import java.util.Map;
  * @description 订单统计
  * @data 2019/11/11 9:14
  */
+@Slf4j
 @Api(tags = "订单统计")
 @RestController
 @RequestMapping("admin/order/received_statistics")
@@ -36,4 +45,22 @@ public class OrderReceivedStatisticsAdminController {
          Map<String, List<OrderReceivedStatisticsVo>> orderReceivedStatisticsPageVo = orderReceivedStatisticsBiz.getOrderReceivedStatisticsResult(orderReceivedStatisticsFindDTO);
          return ObjectRestResponse.succ(orderReceivedStatisticsPageVo);
      }
+
+    @ApiOperation("订单统计excel导出下载")
+    @PostMapping(value = "/export",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ObjectRestResponse<Void> exportOrderReceivedStatistics(@RequestBody @BeanValid OrderReceivedStatisticsFindDTO orderReceivedStatisticsFindDTO, HttpServletResponse response){
+        try {
+            String name = DateTimeFormatter.ofPattern("YYYYMMddHHmmss").format(LocalDateTime.now());
+            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+            String filename = String.format("%s-OrderReceivedStatistics.xlsx",name);
+            response.setHeader("Content-Disposition","attachment;filename="+ new String(filename.getBytes(), "iso8859-1"));
+            ServletOutputStream outputStream = response.getOutputStream();
+            orderReceivedStatisticsBiz.exportOrderReceivedStatisticsData(orderReceivedStatisticsFindDTO,outputStream);
+            response.setCharacterEncoding("UTF-8");
+            return ObjectRestResponse.succ();
+        }catch (Exception ex){
+             log.error("导出数据失败【{}】",ex);
+            throw  new BaseException("导出数据失败");
+        }
+    }
 }