Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

@@ -1664,10 +1664,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleDaysPrice.setPriceJson(jsonObject.getString("priceList"));
             vehicleDaysPrice.setStatus(jsonObject.getInteger("status"));
             vehicleDaysPriceBiz.addOrUpd(vehicleDaysPrice);
-            BigDecimal vehiclePrice = vehicleDaysPriceBiz.getVehiclePrice(vehicleId, 0);
-            if (vehiclePrice != null && vehiclePrice.compareTo(BigDecimal.ZERO) > 0){
+            Vehicle vehiclePrice = vehicleDaysPriceBiz.getVehiclePrice(vehicleId, 0);
+            if (vehiclePrice != null  ){
                 Vehicle vehicle = new Vehicle();
-                vehicle.setPrice(vehiclePrice);
+                vehicle.setPrice(vehiclePrice.getPrice());
+                vehicle.setHolidayPrice(vehiclePrice.getHolidayPrice());
                 vehicle.setId(vehicleId);
                 updateSelectiveById(vehicle);
             }

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

@@ -63,6 +63,17 @@ public class VehicleDaysPriceBiz extends BaseBiz<VehicleDaysPriceMapper, Vehicle
      }
 
 
+    public VehicleDaysPrice getInfoV2(String vehicleId){
+        Example example = new Example(VehicleDaysPrice.class);
+        example.createCriteria().andEqualTo("vehicleId",vehicleId).andEqualTo("isDel",0);
+        List<VehicleDaysPrice> list = selectByExample(example);
+        if (list.size() > 0){
+            return  list.get(0);
+        }
+        return  null;
+    }
+
+
      public  List<VehicleDaysPriceVo>  getListByVehicleId(String vehicleId){
          VehicleDaysPrice vehicleDaysPrice = getInfo(vehicleId);
          List<VehicleDaysPriceVo> priceVos = null;
@@ -72,25 +83,29 @@ public class VehicleDaysPriceBiz extends BaseBiz<VehicleDaysPriceMapper, Vehicle
          return priceVos;
      }
 
-     public BigDecimal  getVehiclePrice(String vehicleId,Integer days){
+     public  Vehicle  getVehiclePrice(String vehicleId,Integer days){
+         Vehicle vehicle = vehicleBiz.selectById(vehicleId);
          List<VehicleDaysPriceVo> priceVos = getListByVehicleId(vehicleId);
-         BigDecimal price = BigDecimal.ZERO;
+         BigDecimal price = vehicle.getPrice();
+         BigDecimal maxPrice = vehicle.getHolidayPrice();
          if (priceVos != null  && priceVos.size() > 0){
              VehicleDaysPriceVo vehicleDaysPriceVo;
+             VehicleDaysPriceVo maxVehicleDaysPriceVo;
              if (days == null || days == 0){
                  vehicleDaysPriceVo = priceVos.stream().min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
+                 maxVehicleDaysPriceVo = priceVos.stream().max(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
              }else {
                  vehicleDaysPriceVo = priceVos.stream().filter(x -> x.getStartDay() <= days && (x.getEndDay() == -1 || x.getEndDay() >= days)).min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
+                 maxVehicleDaysPriceVo = priceVos.stream().filter(x -> x.getStartDay() <= days && (x.getEndDay() == -1 || x.getEndDay() >= days)).max(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
              }
              if (vehicleDaysPriceVo != null )
                  price = vehicleDaysPriceVo.getPrice();
+             if (maxVehicleDaysPriceVo != null )
+                 maxPrice = maxVehicleDaysPriceVo.getPrice();
          }
-         if (price.compareTo(BigDecimal.ZERO) == 0 ){
-             Vehicle vehicle = vehicleBiz.selectById(vehicleId);
-             if (vehicle != null)
-                 price = vehicle.getPrice();
-         }
-         return  price;
+         vehicle.setPrice(price);
+         vehicle.setHolidayPrice(maxPrice);
+         return  vehicle;
      }
 
 

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

@@ -6,12 +6,15 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.vehicle.aop.GlobalLog;
 import com.xxfc.platform.vehicle.biz.VehicleApplyBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
+import com.xxfc.platform.vehicle.biz.VehicleDaysPriceBiz;
 import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleApply;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -26,6 +29,10 @@ import java.util.List;
 public class AppVehicleController extends BaseController<VehicleBiz> {
 
 
+    @Autowired
+    VehicleDaysPriceBiz vehicleDaysPriceBiz;
+
+
 
 
 
@@ -94,6 +101,23 @@ public class AppVehicleController extends BaseController<VehicleBiz> {
 
 
 
+    @PostMapping("setDaysPrice")
+    @ApiModelProperty("设置价格")
+    public  ObjectRestResponse setDaysPrice(@RequestBody VehicleApply vehicle) {
+        baseBiz.updVehicleDaysPrice(vehicle);
+        return ObjectRestResponse.succ();
+    }
+
+
+
+    @GetMapping("daysPriceInfo")
+    @ApiModelProperty("商品详情")
+    public  ObjectRestResponse info(@RequestParam(value = "vehicleId")String vehicleId) {
+        return  ObjectRestResponse.succ(vehicleDaysPriceBiz.getInfoV2(vehicleId));
+    }
+
+
+