Merge branch 'master-vehicle-price' into dev-tiande

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

 package com.xxfc.platform.vehicle.rest;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -23,9 +26,11 @@ import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
@@ -63,6 +68,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     private VehiclePlatCataBiz vehiclePlatCataBiz;
 
+    @Autowired
+    private VehicleCataBiz vehicleCataBiz;
+
     @Autowired
     private VehicleWarningMsgBiz vehicleWarningMsgBiz;
 
@@ -81,6 +89,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     VehicleDepartureService vehicleDepartureService;
 
+    @Autowired
+    VehicleModelBiz vehicleModelBiz;
+
+    @Autowired
+    VehicleHolidayPriceInfoBiz vehicleHolidayPriceInfoBiz;
 
     public UserFeign getUserFeign() {
         return userFeign;
@@ -623,4 +636,50 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
    public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){
         return  vehicleBiz.findbyPlateNumberAndVehicleCod(plateNumber,vehicleCode);
     }
+
+
+
+
+    /*** 新增给App ****/
+
+    @RequestMapping(value = "/app/unauth/findById", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public RestResponse<VehicleVO> appFindById(String id, String priceStartDate, String priceEndDate) {
+        Vehicle vehicle =  baseBiz.get(id);
+        VehicleVO vehicleVO = BeanUtil.toBean(vehicle, VehicleVO.class);
+        vehicleVO.setVehicleModel(vehicleModelBiz.selectById(vehicleVO.getModelId()));
+        List<VehicleCata> vehicleCatas = vehicleCataBiz.selectList(new VehicleCata(){{
+            setVehicleModelId(vehicleVO.getModelId());
+        }});
+        if(CollUtil.isNotEmpty(vehicleCatas)) {
+            List<Integer> list = vehicleCatas.parallelStream().map(VehicleCata::getCataId).collect(Collectors.toList());
+            vehicleVO.setVehiclePlatCatas(vehiclePlatCataBiz.selectByWeekend(w -> {
+                w.andIn(VehiclePlatCata::getId, list);
+                return w;
+            }));
+        }
+
+        if(StrUtil.isNotBlank(priceStartDate) && StrUtil.isNotBlank(priceEndDate)) {
+            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), priceStartDate, priceEndDate, null, vehicleVO.getSubordinateBranch()));
+        }
+
+        return RestResponse.data(vehicleVO);
+    }
+
+
+    @Data
+    static public class VehicleVO extends Vehicle {
+        private VehicleModel vehicleModel;
+        private List<VehiclePlatCata> vehiclePlatCatas;
+        private List<VehicleModelCalendarPriceDTO> priceDTOS;
+        /**
+         * 价格开始日期
+         */
+        private String priceStartDate;
+
+        /**
+         * 价格结束日期
+         */
+        private String priceEndDate;
+    }
 }