lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单接口改进

Browse Source
This commit is contained in:
zhh
2018-10-26 16:57:06 +08:00
parent 168dc0b10b
commit e90c511f66
10 changed files with 742 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View File

@@ -93,6 +93,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
orderItem.setProductId(cartPromotionItem.getProductId());
orderItem.setProductName(cartPromotionItem.getProductName());
orderItem.setProductPic(cartPromotionItem.getProductPic());
orderItem.setProductAttr(cartPromotionItem.getProductAttr());
orderItem.setProductBrand(cartPromotionItem.getProductBrand());
orderItem.setProductSn(cartPromotionItem.getProductSn());
orderItem.setProductPrice(cartPromotionItem.getPrice());
@@ -151,6 +152,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
lockStock(cartPromotionItemList);
//根据商品合计、运费、活动优惠、优惠券、积分计算应付金额
OmsOrder order = new OmsOrder();
order.setDiscountAmount(new BigDecimal(0));
order.setTotalAmount(calcTotalAmount(orderItemList));
order.setFreightAmount(new BigDecimal(0));
order.setPromotionAmount(calcPromotionAmount(orderItemList));