Merge branch 'master' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

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

@@ -159,7 +159,7 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     }
 
     public OrderStatistics findAll(List<Integer> companyIds) {
-        return mapper.monthOrderTotal(companyIds);
+         return mapper.monthOrderTotal(companyIds);
     }
 
     /**

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

@@ -18,7 +18,7 @@ public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOr
 
     Map<String, Object> getTravelGmv(@Param("day") Integer day);
 
-    OrderStatistics monthOrderTotal(List<Integer> companyIds);
+    OrderStatistics monthOrderTotal(List<Integer> list);
 
 
 

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

@@ -19,5 +19,5 @@ public interface DailyTravelOrderStatisticsMapper extends Mapper<DailyTravelOrde
 
     List<DailyTravelOrderStatistics> getTravelPenalSum(@Param("day") Integer day);
 
-    OrderStatistics monthOrderTotal(List<Integer> companyIds);
+    OrderStatistics monthOrderTotal(List<Integer> list);
 }

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

@@ -25,5 +25,5 @@ public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOr
 
     List<DailyVehicleOrderStatistics> getViolationMoney(@Param("day") Integer day);
 
-    OrderStatistics monthOrderTotal(List<Integer> companyIds);
+    OrderStatistics monthOrderTotal(@Param("list") List<Integer> list);
 }

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

@@ -100,7 +100,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             UserDTO user = userDTOObjectRestResponse.getData();
             List<Integer> companyIds = null;
             if (!DATA_AUTHORITY.equals(user.getDataAll())) {
-                companyIds = vehicleFeign.getCompanyIds().getData();
+                companyIds = vehicleFeign.getCompanyIds(user.getDataZone(), user.getDataCompany()).getData();
             }
             //只统计租车订单
             if (TYPE_VEHICLE.equals(type)) {

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

@@ -22,9 +22,9 @@
         daily_members_order_statistics
         WHERE
         1=1
-        <if test="companyIds != null and companyIds.size()!=0">
+        <if test="list != null and list.size()!=0">
             and branch_company_id  in
-            <foreach collection="companyIds" index="index" item="companyId" open="(" separator="," close=")" >
+            <foreach collection="list" index="index" item="companyId" open="(" separator="," close=")" >
                 #{companyId}
             </foreach>
         </if>

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

@@ -58,9 +58,9 @@
         daily_travel_order_statistics
         WHERE
         1=1
-        <if test="companyIds != null and companyIds.size()!=0">
+        <if test="list != null and list.size()!=0">
             and branch_company_id  in
-            <foreach collection="companyIds" index="index" item="companyId" open="(" separator="," close=")" >
+            <foreach collection="list" index="index" item="companyId" open="(" separator="," close=")" >
                 #{companyId}
             </foreach>
         </if>

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

@@ -94,9 +94,9 @@
         daily_vehicle_order_statistics
         WHERE
         1=1
-        <if test="companyIds != null and companyIds.size()!=0">
+        <if test="list != null and list.size()!=0">
            and branch_company_id  in
-           <foreach collection="companyIds" index="index" item="companyId" open="(" separator="," close=")" >
+           <foreach collection="list" index="index" item="companyId" open="(" separator="," close=")" >
                #{companyId}
            </foreach>
         </if>

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

 package com.xxfc.platform.vehicle.feign;
 
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -179,8 +180,6 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
     public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
 
-    @RequestMapping(value ="/branchCompany/app/unauth/getCompanyIds",method = RequestMethod.GET)
-    RestResponse<List<Integer>> getCompanyIds();
 
     /**
      * 车型日历价格
@@ -197,6 +196,9 @@ public interface VehicleFeign {
                                                                                                @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
                                                                                                @RequestParam(value = "userId") Integer userId);
 
+    @GetMapping(value ="/branchCompany/getCompanyIds")
+    RestResponse<List<Integer>> getCompanyIds(@RequestParam(value = "dataZone")String dataZone ,@RequestParam(value = "dataCompany")String dataCompany);
+
     @GetMapping(value = "/bookRecord/get")
     public ObjectRestResponse<List<BookRecordUpdateLog>> get(@RequestParam(value = "bookRecordId")Long bookRecordId);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -413,8 +413,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return  ObjectRestResponse.succ(list);
     }
 
-    public List<Integer> getCompanyIds() {
-        UserDTO userDTO = getAdminUserInfo();
-       return vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+    public List<Integer> getCompanyIds(String dataZone ,String dataCompany) {
+        return vehicleBiz.dataCompany(dataZone, dataCompany);
     }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -221,10 +221,10 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         return baseBiz.branchCompans();
     }
 
-    @RequestMapping(value ="/app/unauth/getCompanyIds",method = RequestMethod.GET)
-    public RestResponse<List<Integer>> getCompanyIds() {
-            return RestResponse.suc(baseBiz.getCompanyIds());
 
+    @GetMapping(value ="/getCompanyIds")
+    public RestResponse<List<Integer>> getCompanyIds(@RequestParam(value = "dataZone",defaultValue ="")String dataZone ,@RequestParam(value = "dataCompany")String dataCompany) {
+        return RestResponse.suc(baseBiz.getCompanyIds(dataZone,dataCompany));
     }
 
 }