修改统计

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java

@@ -14,11 +14,7 @@ import java.math.BigDecimal;
 @Data
 @ApiModel(value = "月订单统计实体")
 public class OrderStatistics {
-    /**
-     * 公司id
-     */
-    @ApiModelProperty(value = "公司id")
-    private Integer branchCompanyId;
+
     /**
      * 月成交总金额
      */

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

@@ -11,6 +11,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -43,6 +44,7 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
             }
             return true;
         } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
             return false;
         }

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

@@ -3,10 +3,51 @@ package com.xxfc.platform.order.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.OrderStatisticsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+
+import static io.lettuce.core.ZStoreArgs.Builder.sum;
+import static java.util.stream.Collectors.groupingBy;
+
 /**
  * @author Administrator
  */
 @Service
 public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper,OrderStatistics>  {
+    @Autowired
+    private DailyVehicleOrderStatisticsBiz vehicleBiz;
+
+
+    @Autowired
+    private DailyTravelOrderStatisticsBiz TravelBiz;
+
+    @Autowired
+    private DailyMembersOrderStatisticsBiz membersBiz;
+
+    public OrderStatistics getToalOrder(Integer companyId) {
+        OrderStatistics result = new OrderStatistics();
+        ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
+
+        OrderStatistics vehicle = vehicleBiz.findAll(companyId);
+        if (vehicle!=null) {orderStatistics.add(vehicle);}
+        OrderStatistics tour = TravelBiz.findAll(companyId);
+
+        if (vehicle!=null) {orderStatistics.add(tour);}
+        OrderStatistics member = membersBiz.findAll(companyId);
+        if (vehicle!=null) {orderStatistics.add(member);}
+
+        result.setTotalGmv(orderStatistics.stream().map(OrderStatistics::getTotalGmv).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalForfeit(orderStatistics.stream().map(OrderStatistics::getTotalForfeit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalCompensation(orderStatistics.stream().map(OrderStatistics::getTotalCompensation).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalRefundSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalRefundSecurityDeposit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalSecurityDeposit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalPenalSum(orderStatistics.stream().map(OrderStatistics::getTotalPenalSum).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalPostpone(orderStatistics.stream().map(OrderStatistics::getTotalPostpone).reduce(BigDecimal.ZERO,BigDecimal::add));
+
+        return result;
+    }
+
 }

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

@@ -70,6 +70,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
              throw new BaseException("请登录!");
         }
         UserDTO user = userDTOObjectRestResponse.getData();
+
         Integer companyId = user.getCompanyId();
         if (TYEP_VEHICLE.equals(type)) {
             OrderStatistics vehicle = vehicleBiz.findAll(companyId);
@@ -84,7 +85,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             return ObjectRestResponse.succ(member);
         }
 
-
+         if (TYEP_TOTAL.equals(type)){
+             baseBiz.getToalOrder(companyId);
+         }
         return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"参数为空!");
     }
 }

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -17,7 +17,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv
         FROM
         daily_travel_order_statistics

xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.xml

@@ -51,7 +51,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv,
         IFNULL(sum(penal_sum) ,0) as totalPenalSum
         FROM

xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml

@@ -139,7 +139,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv,
         IFNULL(sum(security_deposit),0) as totalSecurityDeposit,
         IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,