修改统计

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

@@ -8,15 +8,14 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Objects;
 
-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>  {
+public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStatistics> {
     @Autowired
     private DailyVehicleOrderStatisticsBiz vehicleBiz;
 
@@ -32,20 +31,32 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper,OrderStati
         ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
 
         OrderStatistics vehicle = vehicleBiz.findAll(companyId);
-        if (vehicle!=null) {orderStatistics.add(vehicle);}
+        if (vehicle != null) {
+            orderStatistics.add(vehicle);
+        }
         OrderStatistics tour = TravelBiz.findAll(companyId);
 
-        if (vehicle!=null) {orderStatistics.add(tour);}
+        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));
+        if (vehicle != null) {
+            orderStatistics.add(member);
+        }
+
+        result.setTotalGmv(orderStatistics.stream().map(OrderStatistics::getTotalGmv).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalForfeit(orderStatistics.stream().map(OrderStatistics::getTotalForfeit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalCompensation(orderStatistics.stream().map(OrderStatistics::getTotalCompensation).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalRefundSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalRefundSecurityDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalSecurityDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalPenalSum(orderStatistics.stream().map(OrderStatistics::getTotalPenalSum).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        result.setTotalPostpone(orderStatistics.stream().map(OrderStatistics::getTotalPostpone).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
         return result;
     }

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

@@ -27,11 +27,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("orderStatistics")
 @Api(description = "每月总的订单统计")
 public class OrderStatisticsController extends BaseController<OrderStatisticsBiz, OrderStatistics> {
-     @Autowired
-     private UserFeign userFeign;
+    @Autowired
+    private UserFeign userFeign;
 
-     @Autowired
-     private UserAuthConfig userAuthConfig;
+    @Autowired
+    private UserAuthConfig userAuthConfig;
     /**
      * 租车订单
      */
@@ -65,29 +65,39 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @ApiOperation("获取订单统计数据")
     @GetMapping("/findAll/{type}")
     public ObjectRestResponse findAll(@PathVariable Integer type) {
-        ObjectRestResponse<UserDTO> userDTOObjectRestResponse = userFeign.userinfoByToken(userAuthConfig.getToken(getRequest()));
-        if (userDTOObjectRestResponse==null||userDTOObjectRestResponse.getData()==null) {
-             throw new BaseException("请登录!");
-        }
-        UserDTO user = userDTOObjectRestResponse.getData();
 
-        Integer companyId = user.getCompanyId();
-        if (TYEP_VEHICLE.equals(type)) {
-            OrderStatistics vehicle = vehicleBiz.findAll(companyId);
-            return ObjectRestResponse.succ(vehicle);
-        }
-        if (TYEP_TOUR.equals(type)) {
-            OrderStatistics tour = TravelBiz.findAll(companyId);
-            return ObjectRestResponse.succ(tour);
-        }
-        if (TYEP_MEMBER.equals(type)) {
-            OrderStatistics member = membersBiz.findAll(companyId);
-            return ObjectRestResponse.succ(member);
+
+        try {
+            ObjectRestResponse<UserDTO> userDTOObjectRestResponse
+                    = userFeign.userinfoByToken(userAuthConfig.getToken(getRequest()));
+
+            if (userDTOObjectRestResponse == null || userDTOObjectRestResponse.getData() == null) {
+                throw new BaseException("请登录!");
+            }
+            UserDTO user = userDTOObjectRestResponse.getData();
+
+            Integer companyId = user.getCompanyId();
+            if (TYEP_VEHICLE.equals(type)) {
+                OrderStatistics vehicle = vehicleBiz.findAll(companyId);
+                return ObjectRestResponse.succ(vehicle);
+            }
+            if (TYEP_TOUR.equals(type)) {
+                OrderStatistics tour = TravelBiz.findAll(companyId);
+                return ObjectRestResponse.succ(tour);
+            }
+            if (TYEP_MEMBER.equals(type)) {
+                OrderStatistics member = membersBiz.findAll(companyId);
+                return ObjectRestResponse.succ(member);
+            }
+
+            if (TYEP_TOTAL.equals(type)) {
+                return ObjectRestResponse.succ(baseBiz.getToalOrder(companyId));
+            }
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ObjectRestResponse.createDefaultFail();
         }
 
-         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

@@ -20,9 +20,9 @@
 
         IFNULL(sum(gmv),0) as totalGmv
         FROM
-        daily_travel_order_statistics
+        daily_members_order_statistics
         WHERE
-        branch_company_id =#{companyId}
+        branch_company_id =1
         and
         DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
     </select>