Commit 96f85f4a authored by 周健威's avatar 周健威

修改

parent a8cca14d
package com.xxfc.platform.order.entity; package com.xxfc.platform.order.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -237,4 +238,7 @@ public class ShuntApply implements Serializable { ...@@ -237,4 +238,7 @@ public class ShuntApply implements Serializable {
@Column(name = "is_bizdel") @Column(name = "is_bizdel")
private Integer isBizdel; private Integer isBizdel;
@Column(name = "real_amount")
private BigDecimal realAmount;
} }
...@@ -266,4 +266,11 @@ public class SpecialRent implements Serializable { ...@@ -266,4 +266,11 @@ public class SpecialRent implements Serializable {
@Column(name = "over_time") @Column(name = "over_time")
@ApiModelProperty(value = "超时时间戳", hidden = true ) @ApiModelProperty(value = "超时时间戳", hidden = true )
private Long overTime; private Long overTime;
/**
* 超时时间戳
*/
@Column(name = "price_type")
@ApiModelProperty(value = "超时时间戳", hidden = true )
private Integer priceType;
} }
...@@ -113,6 +113,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> { ...@@ -113,6 +113,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
specialRent.setBrandId(vehicle.getBrandId()); specialRent.setBrandId(vehicle.getBrandId());
specialRent.setCategoryId(vehicle.getCategoryId()); specialRent.setCategoryId(vehicle.getCategoryId());
specialRent.setGoodsType(vehicle.getGoodsType()); specialRent.setGoodsType(vehicle.getGoodsType());
specialRent.setPriceType(vehicle.getPriceType());
//缓存商品信息 //缓存商品信息
specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString()); specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString());
......
...@@ -229,6 +229,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp ...@@ -229,6 +229,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
setId(shuntApply.getId()); setId(shuntApply.getId());
setStatus(ShuntApply.STATUS_ORDER); setStatus(ShuntApply.STATUS_ORDER);
setOrderStatus(ShuntApply.ORDER_STATUS_TOPAY); setOrderStatus(ShuntApply.ORDER_STATUS_TOPAY);
setRealAmount(bo.getOrder().getRealAmount());
}}); }});
return ObjectRestResponse.succ(bo.getOrder()); return ObjectRestResponse.succ(bo.getOrder());
} }
......
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