|
|
@ -118,8 +118,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im |
|
|
|
totalAmount.add(itemPrice); |
|
|
|
} |
|
|
|
calcAmount.setTotalAmount(totalAmount); |
|
|
|
//todo 计算供应商折扣
|
|
|
|
//todo 计算是否有活动优惠
|
|
|
|
// 计算供应商折扣
|
|
|
|
// 计算是否有活动优惠
|
|
|
|
BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId())); |
|
|
|
OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult(); |
|
|
|
confirmOrderResult.setSupplier(supplier); |
|
|
@ -198,8 +198,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im |
|
|
|
OmsCalcAmount calcAmount = new OmsCalcAmount(); |
|
|
|
calcAmount.setTotalAmount(BigDecimal.ZERO); |
|
|
|
|
|
|
|
//todo 计算供应商折扣
|
|
|
|
//todo 计算是否有活动优惠
|
|
|
|
// 计算供应商折扣
|
|
|
|
// 计算是否有活动优惠
|
|
|
|
//收货地址
|
|
|
|
BmsSupplierAddress supplierAddress = null; |
|
|
|
if(confirmOrder.getAddressId()==null){ |
|
|
@ -680,7 +680,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im |
|
|
|
//offerOrder.setSaleTypeCode();
|
|
|
|
offerOrder.setCusCode(omsOrder.getSupplierCode()); |
|
|
|
offerOrder.setDepCode(dept.getCode()); |
|
|
|
//TODO 普通13,赠品&试吃品0
|
|
|
|
// 普通13,赠品&试吃品0
|
|
|
|
//offerOrder.setTaxRate();
|
|
|
|
offerOrder.setRemark(omsOrder.getRemark()); |
|
|
|
//offerOrder.setRemark2();
|
|
|
|