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