Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -6,6 +6,7 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
@@ -20,6 +21,7 @@ import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
+import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -160,8 +162,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     private void acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
-        BookVehicleVO bookVehicleVO = detail.getBookVehicleVO();
-        ObjectRestResponse<String> orr = vehicleFeign.rentApplyVehicle(bookVehicleVO);
+        RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
+        rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
+        ObjectRestResponse<String> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
         detail.setVehicleId(orr.getData());
     }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -5,6 +5,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -21,8 +22,8 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(@RequestParam(value="id")Integer  id, @RequestParam(value="score")Integer  score);
 
-    @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
-    public ObjectRestResponse<String> rentApplyVehicle(@RequestBody BookVehicleVO bookVehicleVo);
+    @RequestMapping(value = "/vehicleInfo/rent/book/vehicle", method = RequestMethod.POST)
+    public ObjectRestResponse<String> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
 
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
     public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -39,4 +39,9 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("目的地")
     private String destination;
 
+    /**
+     *  用户名
+     */
+    @ApiModelProperty("用户名")
+    private String userName;
 }
\ No newline at end of file

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

@@ -307,10 +307,13 @@ public class VehicleController extends BaseController<VehicleBiz> {
      */
     @ApiOperation("租车触发的申请预定车辆")
     @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
+    @IgnoreClientToken
+    @IgnoreUserToken
     public ObjectRestResponse<String> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
-        String userName = BaseContextHandler.getName();
+        String userName = dto.getUserName();
+                //BaseContextHandler.getName();
         BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);
         dto.setLimit(1);
         dto.setPage(1);