Merge branch 'feature_chw_zjw' into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -434,6 +434,12 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "goods_deposit_type")
 	private Integer goodsDepositType;
 
+	/**
+	 * 价格类型 1--天；2--小时
+	 */
+	@Column(name = "price_type")
+	private Integer priceType;
+
 	public Long getEndTime() {
 		return endTime;
 	}

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

@@ -573,6 +573,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
         rvp.setOrderSign(detail.getOrderSign());
+        rvp.setPriceType(vehicle.getPriceType());
         rvp.setDeposit(depositAmount);
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setDamageSafePrice(DAMAGE_SAFE);
@@ -770,6 +771,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
         rvp.setOrderSign(detail.getOrderSign());
+        rvp.setPriceType(vehicle.getPriceType());
         rvp.setDeposit(depositAmount);
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setDamageSafePrice(DAMAGE_SAFE);