Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -310,7 +310,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
 
         ShuntApply shuntApply = baseBiz.selectById(dto.getApplyId());
         if(null == shuntApply || shuntApply.getStatus() != STATUS_CRT) {
-            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE,Sets.newSet("该需求已失效"));
+            throw new BaseException("该需求已失效", ResultCode.PARAM_ILLEGAL_CODE);
         }
 
         RentVehicleBO detail = new RentVehicleBO();
@@ -335,7 +335,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
             orderRentVehicleService.acquireVehicle(detail, null , null);
         }catch (Exception e) {
             getLog().error(e.getMessage(), e);
-            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE,Sets.newSet("无法选择该车辆"));
+            throw new BaseException("无法选择该车辆", ResultCode.PARAM_ILLEGAL_CODE);
         }
 
         shuntApply.setVehicleId(dto.getVehicleId());

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

@@ -110,14 +110,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     }
 
 
-    @RequestMapping(value = "/app/pageList", method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/app/pageList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "分页查询可参加特惠租车")
+    @IgnoreUserToken
     public ObjectRestResponse<SpecialRentVO> pageList(QueryDTO dto) {
         //查询列表数据
-        if (StrUtil.isBlank(getCurrentUserId())) {
-            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
-        }
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(STATUS_CRT, STATUS_AUTOCNL_ORDER, STATUS_AUTOCNL_TOPAY, STATUS_AUTOCNL_PAYED));