Merge branch 'dev-chw-vehicle' into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -69,7 +69,7 @@ public class BaseOrder implements Serializable {
 		+"3--待付款"
 		+"4--待出行"
 		+"5--出行中（进行中）"
-+"6--已完成")
+		+"6--已完成")
     private Integer status;
 
 	    /**

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

@@ -6,9 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -1087,4 +1085,5 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		}
 		return pageDataVO;
 	}
+
 }
\ No newline at end of file

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

@@ -99,7 +99,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
-    public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
+    public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) throws BaseException{
+        UserDTO byAppUser = getBusinessUserByAppUser();
+        if (byAppUser == null ) {
+           throw new BaseException(ResultCode.RSTOKEN_EXPIRED_CODE);
+        }
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getTypes())) {
             String[] types = orderVehicleCrosstownDto.getTypes().split(",");
             orderVehicleCrosstownDto.setTypeList(Lists.newArrayList(types));

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

 package com.xxfc.platform.order.rest;
 
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
@@ -49,11 +47,7 @@ public class OrderVehicleCrosstownController {
     @GetMapping(value = "/getByOrderId")
     @ApiOperation(value = "根据订单Id获取所有记录信息")
     public ObjectRestResponse<List<OrderVehicleCrosstownDto>> getByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-        UserDTO userDTO = userInfoBiz.getAdminUserInfo();
-        AppUserDTO appUserDTO = userInfoBiz.getUserInfo();
-        if (userDTO == null && appUserDTO == null) {
-                return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
-        }
+
         if (orderVehicleCrosstownDto == null) {
             return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
         }