Merge branch 'master-Member-bug-modify' into base-modify

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -108,10 +108,17 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @CrossOrigin
     public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(BaseOrderController.QueryOrderList dto) {
-		UserDTO userDTO = getAdminUserInfo();
-		if (userDTO == null) {
-			return ObjectRestResponse.succ(new PageDataVO<>());
-		}
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.succ(new PageDataVO<>());
+        }
+        //车辆排班表查询订单详情
+        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());

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

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

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>

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodMapper.java

@@ -38,7 +38,7 @@ public interface TourGoodMapper extends Mapper<TourGood> {
      */
     List<GoodDataVO> findAllByHome(@Param("start") Integer start, @Param("size") Integer size);
 
-    List<TourGood> getList(WebsiteQuery query);
+    List<GoodDataVO> getList(WebsiteQuery query);
 
     List newTour(Integer limit);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/officialWebsite/OfficialWebsiteTourController.java

@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.*;
 
 
 @RestController
-@RequestMapping("website")
+@RequestMapping("/website/app/unauth")
 @IgnoreClientToken
 @IgnoreUserToken
 @Api(tags = {"官网"})
 public class OfficialWebsiteTourController extends BaseController<TourGoodBiz, TourGood> {
 
-    @PostMapping("/app/unauth/tour")
+    @PostMapping("/tour")
     public ObjectRestResponse homePageTour(@RequestBody WebsiteQuery query) throws Exception {
         return ObjectRestResponse.succ(baseBiz.homePageTour(query));
     }
 
 
-    @GetMapping("/app/unauth/tour/new")
+    @GetMapping("/tour/new")
     public ObjectRestResponse newTour(@RequestParam(value = "limit", defaultValue = "6") Integer limit) {
         return ObjectRestResponse.succ(baseBiz.newTour(limit));
     }