修改获取用户id相关

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java

@@ -35,4 +35,12 @@ public class CommonBaseController {
     public String getCurrentUserId(){
         return BaseContextHandler.getUserID();
     }
+
+    public Integer getCurrentUserIdInt(){
+        if(null != BaseContextHandler.getUserID()) {
+            return Integer.valueOf(BaseContextHandler.getUserID());
+        }else {
+            return null;
+        }
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/common/BaseController.java

 package com.xxfc.platform.vehicle.common;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -12,4 +13,24 @@ public class BaseController<Biz extends BaseBiz> {
     protected HttpServletRequest request;
     @Autowired
     protected Biz baseBiz;
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public String getCurrentUserName(){
+        return BaseContextHandler.getUsername();
+    }
+
+    public String getCurrentUserId(){
+        return BaseContextHandler.getUserID();
+    }
+
+    public Integer getCurrentUserIdInt(){
+        if(null != BaseContextHandler.getUserID()) {
+            return Integer.valueOf(BaseContextHandler.getUserID());
+        }else {
+            return null;
+        }
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -646,6 +646,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @RequestMapping(value = "/app/unauth/findById", method = RequestMethod.GET)
     @IgnoreUserToken
     public RestResponse<VehicleVO> appFindById(String id, String priceStartDate, String priceEndDate) {
+        Integer userId = getCurrentUserIdInt();
         Vehicle vehicle =  baseBiz.get(id);
         VehicleVO vehicleVO = BeanUtil.toBean(vehicle, VehicleVO.class);
         vehicleVO.setVehicleModel(vehicleModelBiz.selectById(vehicleVO.getModelId()));
@@ -661,9 +662,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         }
 
         if(StrUtil.isNotBlank(priceStartDate) && StrUtil.isNotBlank(priceEndDate)) {
-            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), priceStartDate, priceEndDate, null, vehicleVO.getSubordinateBranch()));
+            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), priceStartDate, priceEndDate, userId, vehicleVO.getSubordinateBranch()));
         }else {
-            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), DateUtil.today(), DateUtil.offsetDay(DateUtil.date(), 6).toDateStr(), null, vehicleVO.getSubordinateBranch()));
+            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), DateUtil.today(), DateUtil.offsetDay(DateUtil.date(), 6).toDateStr(), userId, vehicleVO.getSubordinateBranch()));
         }
 
         return RestResponse.data(vehicleVO);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleHolidayPriceInfoController.java

@@ -53,10 +53,10 @@ public class VehicleHolidayPriceInfoController extends BaseController<VehicleHol
 		return baseBiz.deleteByVehicleId(vehicleId, festivalId);
 	}
 
-	@GetMapping(value = "multiCalendarPrice")
+	@GetMapping(value = "/app/unauth/multiCalendarPrice")
 	@IgnoreUserToken
 	public ObjectRestResponse<List<VehicleVO>> multiCalendarPrice(String vehicleIds, String startDate, String endDate) {
-		Integer userId = Integer.valueOf(getCurrentUserId());
+		Integer userId = getCurrentUserIdInt();
 
 		List<VehicleVO> vehicleVOS = CollUtil.newArrayList();
 		if(StrUtil.isNotBlank(vehicleIds)) {