修改订单

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -44,4 +44,7 @@ public class OrderListVo extends BaseOrder {
 
     private List<OrderItem> items;
 
+
+
+
 }

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

@@ -129,8 +129,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
     public List<OrderListVo> listOrder(Map<String, Object> paramMap) {
-
-        return mapper.listOrder(paramMap);
+        List<OrderListVo> orderListVos = mapper.listOrder(paramMap);
+        return orderListVos;
     }
 
     public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap) {

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -113,6 +114,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
+
+
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
@@ -123,11 +126,30 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setCompanyIds(companyIds);
         }
 
+        if (dto.getStartZoneId()!=null){
+            if (userDTO.getDataAll()!=1&&!dto.getStartZoneId().equals(userDTO.getZoneId())) {
+                return ObjectRestResponse.succ(new PageDataVO<>());
+            }else {
+                ArrayList<Integer> zoneIds = new ArrayList<>();
+                zoneIds.add(dto.getStartZoneId());
+                dto.setZoneIds(zoneIds);
+            }
+        }
+
+        if (dto.getStartCompanyId()!=null){
+            if (userDTO.getDataAll()!=1&&!dto.getStartCompanyId().equals(userDTO.getId())) {
+                return ObjectRestResponse.succ(new PageDataVO<>());
+            }else {
+                ArrayList<Integer> companyIds = new ArrayList<>();
+                companyIds.add(dto.getStartCompanyId());
+                dto.setCompanyIds(companyIds);
+            }
+        }
+
         if (StringUtils.isNotEmpty(dto.getPlateNumber())||StringUtils.isNotEmpty(dto.getVehicleCode())){
           List<String> vehicleIds = vehicleFeign.findbyPlateNumberAndVehicleCod(dto.getPlateNumber(),dto.getVehicleCode());
            dto.setVehicleIds(vehicleIds);
         }
-
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();
@@ -144,7 +166,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
 
                 }
             }
-
             for (OrderListVo orderPageVO : list) {
                 AppUserVo appUserVo = appvoMap.get(orderPageVO.getUserId());
                 if(appUserVo != null) {

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

@@ -322,6 +322,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private Integer startZoneId;
 
+        private Integer zoneId;
+
         private Integer userId;
 
         private Integer type;
@@ -343,6 +345,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         //订单用户ID列表
         private List<Integer> userIds;
+        //订单用户大区id列表
+        private List<Integer> zoneIds;
         //订单用户手机号或订单用户真实姓名
         private String keywords;