Merge branch 'master' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java

@@ -258,7 +258,7 @@ public class StaffStatisticsBiz {
         if (CollectionUtils.isNotEmpty(appUserSellingWaterDTOS)) {
             //3.根据订单id查询订单相关信息
             List<Integer> orderIds = appUserSellingWaterDTOS.stream().map(AppUserSellingWaterDTO::getOrderId).collect(Collectors.toList());
-            ObjectRestResponse<List<OrderDTO>> response = orderFeign.findOrdersByorderId(orderIds);
+            ObjectRestResponse<List<OrderDTO>> response = orderFeign.findOrdersByorderIdV2(orderIds);
             List<OrderDTO> orders = response.getData();
             Map<Integer, Integer> ordersMap = orders.stream().collect(Collectors.toMap(OrderDTO::getId, OrderDTO::getCompanyId));
             for (AppUserSellingWaterDTO appUserSellingWaterDTO : appUserSellingWaterDTOS) {

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -27,6 +27,11 @@ public interface OrderFeign {
      public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds);
 
 
+
     @PostMapping(value = "/order/invoice/updateByOrderId")
     ObjectRestResponse updateByOrderId(@RequestBody OrderInvoice orderInvoice);
+
+    @PostMapping(value = "/count/basebase/findOrdersByorderIdV2")
+    ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds);
+
 }

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

@@ -33,4 +33,11 @@ public class OrderListController {
     public ObjectRestResponse<List<OrderDTO>> findOrdersByorderId(@RequestParam(value = "orderIds") List<Integer> orderIds){
         return  ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
     }
+
+    @PostMapping(value = "/basebase/findOrdersByorderIdV2")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody  List<Integer> orderIds){
+        return  ObjectRestResponse.succ(baseOrderBiz.selectBaeOrderByOrderIds(orderIds));
+    }
 }