订单 金额
This commit is contained in:
parent
89a6cc0eb5
commit
8e03d269fb
|
|
@ -44,6 +44,7 @@ public class OrderInfoAddDTO implements Serializable {
|
|||
* 订单原金额(包含打包费+餐位费) 不含折扣价格
|
||||
*/
|
||||
private BigDecimal originAmount;
|
||||
private BigDecimal orderAmount;
|
||||
|
||||
/**
|
||||
* 台桌Id
|
||||
|
|
|
|||
|
|
@ -776,6 +776,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
param.setStaffId(0L);
|
||||
param.setSeatNum(0);
|
||||
param.setOriginAmount(amount);
|
||||
param.setOrderAmount(amount);
|
||||
param.setTableCode("");
|
||||
param.setOrderType("cash");
|
||||
param.setPlatformType("H5");
|
||||
|
|
@ -834,7 +835,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
orderInfo.setTableCode(param.getTableCode());
|
||||
orderInfo.setPlaceNum(param.getPlaceNum());
|
||||
orderInfo.setOriginAmount(param.getOriginAmount());
|
||||
orderInfo.setOrderAmount(BigDecimal.ZERO);
|
||||
if (param.getOrderAmount() != null && param.getOrderAmount().compareTo(BigDecimal.ZERO) >= 0) {
|
||||
orderInfo.setOrderAmount(param.getOrderAmount());
|
||||
}else {
|
||||
orderInfo.setOrderAmount(BigDecimal.ZERO);
|
||||
}
|
||||
orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee()));
|
||||
orderInfo.setRoundAmount(BigDecimal.ZERO);
|
||||
orderInfo.setPointsNum(0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue