Merge branch 'master-Member-bug-modify'

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

@@ -120,6 +120,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setEndTime(new Date().getTime());
             }
         }
+        //车辆排班表查询订单详情
+        if (dto.getOneNo()!=null) {
+            dto.setPage(1);
+            dto.setLimit(1);
+            dto.setType(1);
+        }
         if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
             List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
             if (CollectionUtil.isNotEmpty(appUserLoins)) {

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

@@ -359,6 +359,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private  List<String> vehicleIds;
 
+        /**
+         * 获取一条车辆详情,需要传的订单号
+         */
+        private String oneNo;
+
 
         //订单用户ID列表
         private List<Integer> userIds;

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

@@ -151,6 +151,9 @@
             <if test="no != null and no != '' ">
                 and no like CONCAT ("%", #{no}, "%")
             </if>
+            <if test="oneNo != null and oneNo != '' ">
+                and no =#{oneNo}
+            </if>
             <if test="name != null">
                 and b.name like CONCAT ("%", #{name}, "%")
             </if>