From cd7fc4d7ace0045aede5def061d9e10b3078224c Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 3 Aug 2021 11:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=AF=E8=83=BD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=E4=B9=8B=E5=89=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/StoreFlowServiceImpl.java     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
index ba0c29ea..883ccf5a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
@@ -93,18 +93,19 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
             storeFlow.setDistributionRebate(item.getPriceDetailDTO().getDistributionCommission());
             storeFlow.setBillPrice(item.getPriceDetailDTO().getBillPrice());
             //兼容为空，以及普通订单操作
-            if (StringUtils.isNotEmpty(orderPromotionType) || orderPromotionType.equals(OrderPromotionTypeEnum.NORMAL.name())) {
-                //普通订单操作
+            if (StringUtils.isNotEmpty(orderPromotionType)) {
+                if (orderPromotionType.equals(OrderPromotionTypeEnum.NORMAL.name())) {
+                    //普通订单操作
+                }
+                //如果为砍价活动，填写砍价结算价
+                else if (orderPromotionType.equals(OrderPromotionTypeEnum.KANJIA.name())) {
+                    storeFlow.setKanjiaSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
+                }
+                //如果为砍价活动，填写砍价结算价
+                else if (orderPromotionType.equals(OrderPromotionTypeEnum.POINTS.name())) {
+                    storeFlow.setPointSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
+                }
             }
-            //如果为砍价活动，填写砍价结算价
-            else if (orderPromotionType.equals(OrderPromotionTypeEnum.KANJIA.name())) {
-                storeFlow.setKanjiaSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
-            }
-            //如果为砍价活动，填写砍价结算价
-            else if (orderPromotionType.equals(OrderPromotionTypeEnum.POINTS.name())) {
-                storeFlow.setPointSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
-            }
-
             //添加支付方式
             storeFlow.setPaymentName(order.getPaymentMethod());
             //添加第三方支付流水号