Commit 09d2041b authored by 周健威's avatar 周健威

修改

parent 1308c03a
...@@ -14,6 +14,8 @@ import java.util.List; ...@@ -14,6 +14,8 @@ import java.util.List;
public class ActivityOrderBO extends OrderActiveDetail implements OrderDetail { public class ActivityOrderBO extends OrderActiveDetail implements OrderDetail {
private BaseOrder order; private BaseOrder order;
private AppUserDTO appUserDTO; private AppUserDTO appUserDTO;
/** /**
* 促成人联系方式 * 促成人联系方式
*/ */
......
...@@ -41,6 +41,11 @@ public class RentVehiclePriceVO extends OrderPriceVO{ ...@@ -41,6 +41,11 @@ public class RentVehiclePriceVO extends OrderPriceVO{
private String costDetail = ""; private String costDetail = "";
@ApiModelProperty(value = "价格类型:1-按天;2-按小时") @ApiModelProperty(value = "价格类型:1-按天;2-按小时")
private Integer priceType; private Integer priceType;
/**
* 订单标记 1--普通订单;2--需求预定申请订单;3--特惠租车订单
*/
private Integer orderSign = 1;
// /** // /**
// * 原租车天数 // * 原租车天数
......
...@@ -567,6 +567,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -567,6 +567,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
//生成订单明细 //生成订单明细
RentVehiclePriceVO rvp = new RentVehiclePriceVO(); RentVehiclePriceVO rvp = new RentVehiclePriceVO();
rvp.setOrderSign(detail.getOrderSign());
rvp.setDeposit(depositAmount); rvp.setDeposit(depositAmount);
rvp.setDriverPrice(DRIVER_PRICE); rvp.setDriverPrice(DRIVER_PRICE);
rvp.setDamageSafePrice(DAMAGE_SAFE); rvp.setDamageSafePrice(DAMAGE_SAFE);
...@@ -758,6 +759,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl ...@@ -758,6 +759,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
//生成订单明细 //生成订单明细
RentVehiclePriceVO rvp = new RentVehiclePriceVO(); RentVehiclePriceVO rvp = new RentVehiclePriceVO();
rvp.setOrderSign(detail.getOrderSign());
rvp.setDeposit(depositAmount); rvp.setDeposit(depositAmount);
rvp.setDriverPrice(DRIVER_PRICE); rvp.setDriverPrice(DRIVER_PRICE);
rvp.setDamageSafePrice(DAMAGE_SAFE); rvp.setDamageSafePrice(DAMAGE_SAFE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment