Merge branch 'master-chw-price' into dev-chw

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

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

@@ -82,4 +82,6 @@ public class VehicleVO extends Vehicle {
 
     private VehicleRecordEmploy recordEmploy;
 
+    private List<VehicleDaysPriceVo> priceVoList;
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1741,6 +1741,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return ObjectRestResponse.succ(dataVo);
     }
 
+    public  VehicleVO detail(String vehicleId){
+        VehicleFindDTO vehicleFindDTO = new VehicleFindDTO();
+        vehicleFindDTO.setVehicleId(vehicleId);
+        List<VehicleVO> list = getList(vehicleFindDTO);
+        if (list.size() == 0)
+            throw  new BaseException("商品不存在",ResultCode.FAILED_CODE);
+        VehicleVO vehicleVO = list.get(0);
+        vehicleVO.setPriceVoList(vehicleDaysPriceBiz.getListByVehicleId(vehicleId));
+        return vehicleVO;
+    }
+
     public ObjectRestResponse selectList(VehicleFindDTO vehicleFindDTO){
         Integer type=vehicleFindDTO.getType() == null ? 0 :vehicleFindDTO.getType();
         if (type > 0){
@@ -1848,10 +1859,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public  VehicleVO info(VehicleFindDTO vehicleFindDTO){
-        List<VehicleVO> vehicleVOS=getList(vehicleFindDTO);
+        List<VehicleVO> vehicleVOS  = getList(vehicleFindDTO);
         if (vehicleVOS != null && vehicleVOS.size() > 0){
             VehicleVO vehicleVO=vehicleVOS.get(0);
             vehicleVO.setVehicleApply(vehicleApplyBiz.getVehicleInfo(vehicleFindDTO.getVehicleId()));
+            vehicleVO.setPriceVoList(vehicleDaysPriceBiz.getListByVehicleId(vehicleFindDTO.getVehicleId()));
             return  vehicleVO;
         }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDaysPriceBiz.java

@@ -62,11 +62,20 @@ public class VehicleDaysPriceBiz extends BaseBiz<VehicleDaysPriceMapper, Vehicle
          return  null;
      }
 
-     public BigDecimal  getVehiclePrice(String vehicleId,Integer days){
+
+     public  List<VehicleDaysPriceVo>  getListByVehicleId(String vehicleId){
          VehicleDaysPrice vehicleDaysPrice = getInfo(vehicleId);
+         List<VehicleDaysPriceVo> priceVos = null;
+         if (vehicleDaysPrice != null ) {
+             priceVos = JSONArray.parseArray(vehicleDaysPrice.getPriceJson(), VehicleDaysPriceVo.class);
+         }
+         return priceVos;
+     }
+
+     public BigDecimal  getVehiclePrice(String vehicleId,Integer days){
+         List<VehicleDaysPriceVo> priceVos = getListByVehicleId(vehicleId);
          BigDecimal price = BigDecimal.ZERO;
-         if (vehicleDaysPrice != null ){
-             List<VehicleDaysPriceVo> priceVos = JSONArray.parseArray(vehicleDaysPrice.getPriceJson(), VehicleDaysPriceVo.class);
+         if (priceVos != null  && priceVos.size() > 0){
              VehicleDaysPriceVo vehicleDaysPriceVo;
              if (days == null || days == 0){
                  vehicleDaysPriceVo = priceVos.stream().min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();

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

@@ -74,13 +74,7 @@ public class AppVehicleController extends BaseController<VehicleBiz> {
     @ApiModelProperty("商品详情")
     @IgnoreUserToken
     public  ObjectRestResponse detail(@PathVariable("id") String id ) {
-        VehicleFindDTO vehicleFindDTO =new VehicleFindDTO();
-        vehicleFindDTO.setVehicleId(id);
-        List<VehicleVO> list = baseBiz.getList(vehicleFindDTO);
-        if (list.size() == 0){
-            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"商品不存在");
-        }
-        return  ObjectRestResponse.succ(list.get(0));
+        return  ObjectRestResponse.succ(baseBiz.detail(id));
     }