caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单可能没有订单类型问题，兼容之前代码

Browse Source
This commit is contained in:
Chopper 2021-08-03 11:38:08 +08:00
parent 644de06172
commit cd7fc4d7ac
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
View File

@ -93,7 +93,8 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
storeFlow.setDistributionRebate(item.getPriceDetailDTO().getDistributionCommission()); storeFlow.setDistributionRebate(item.getPriceDetailDTO().getDistributionCommission());
storeFlow.setBillPrice(item.getPriceDetailDTO().getBillPrice()); storeFlow.setBillPrice(item.getPriceDetailDTO().getBillPrice());
//兼容为空，以及普通订单操作 //兼容为空，以及普通订单操作
if (StringUtils.isNotEmpty(orderPromotionType) || orderPromotionType.equals(OrderPromotionTypeEnum.NORMAL.name())) { if (StringUtils.isNotEmpty(orderPromotionType)) {
if (orderPromotionType.equals(OrderPromotionTypeEnum.NORMAL.name())) {
//普通订单操作 //普通订单操作
} }
//如果为砍价活动，填写砍价结算价 //如果为砍价活动，填写砍价结算价
@ -104,7 +105,7 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
else if (orderPromotionType.equals(OrderPromotionTypeEnum.POINTS.name())) { else if (orderPromotionType.equals(OrderPromotionTypeEnum.POINTS.name())) {
storeFlow.setPointSettlementPrice(item.getPriceDetailDTO().getSettlementPrice()); storeFlow.setPointSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
} }
}
//添加支付方式 //添加支付方式
storeFlow.setPaymentName(order.getPaymentMethod()); storeFlow.setPaymentName(order.getPaymentMethod());
//添加第三方支付流水号 //添加第三方支付流水号