Merge branch 'master' into dev

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

@@ -46,12 +46,14 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
     @Autowired
     private DailyMembersOrderStatisticsBiz membersStatisticsBiz;
 
-    public HomePageOrderData getTotalOrder(List<Integer> companyIds) {
+    public HomePageOrderData getTotalOrder(List<Integer> companyIds, Integer dataAll) {
         HomePageOrderData result = new HomePageOrderData();
         ArrayList<HomePageOrderData> list = new ArrayList<>();
         list.add(getVehicleHomePageOrderData(companyIds));
         list.add(getTourHomePageOrderData(companyIds));
-        list.add(getMemberHomePageOrderData(companyIds));
+        if (1==dataAll) {
+            list.add(getMemberHomePageOrderData(companyIds));
+        }
         result.setTotalOrders(list.stream().map(HomePageOrderData::getTotalOrders).reduce(BigDecimal.ZERO, BigDecimal::add));
         result.setTotalOutstandingDeposit(list.stream().map(HomePageOrderData::getTotalOutstandingDeposit).reduce(BigDecimal.ZERO, BigDecimal::add));
         result.setAdditionalIndemnity(list.stream().map(HomePageOrderData::getAdditionalIndemnity).reduce(BigDecimal.ZERO, BigDecimal::add));

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

@@ -111,12 +111,12 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
                 return ObjectRestResponse.succ(baseBiz.getTourHomePageOrderData(companyIds));
             }
             //只统计会员订单
-            if (TYPE_MEMBER.equals(type)) {
+            if (TYPE_MEMBER.equals(type)||DATA_AUTHORITY.equals(user.getDataAll())) {
                 return ObjectRestResponse.succ(baseBiz.getMemberHomePageOrderData(companyIds));
             }
             //所有订单
             if (TYPE_TOTAL.equals(type)) {
-                return ObjectRestResponse.succ(baseBiz.getTotalOrder(companyIds));
+                return ObjectRestResponse.succ(baseBiz.getTotalOrder(companyIds,user.getDataAll()));
             }
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
         } catch (Exception e) {