From 1c6bda99011aba41e7f3dbf017a6f2a228282d01 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Thu, 26 Aug 2021 10:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=8A=A1=E5=8D=95=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E5=94=AE=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/stdiet/custom/service/impl/SysOrderServiceImpl.java     | 2 --
 .../src/main/resources/mapper/custom/SysCommisionMapper.xml     | 2 +-
 stdiet-ui/src/utils/orderType.js                                | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
index a00702d95..5311187bb 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
@@ -227,7 +227,6 @@ public class SysOrderServiceImpl implements ISysOrderService {
             sysOrder.setMainOrderId(0L);
             sysOrder.setAfterSaleCommissOrder(0);
             sysOrder.setPreSaleId(null);
-            sysOrder.setOnSaleId(null);
             sysOrder.setPushPreSaleId(null);
             sysOrder.setPlannerId(null);
             sysOrder.setPlannerAssisId(null);
@@ -327,7 +326,6 @@ public class SysOrderServiceImpl implements ISysOrderService {
             sysOrder.setMainOrderId(0L);
             sysOrder.setAfterSaleCommissOrder(0);
             sysOrder.setPreSaleId(null);
-            sysOrder.setOnSaleId(null);
             sysOrder.setPushPreSaleId(null);
             sysOrder.setPlannerId(null);
             sysOrder.setPlannerAssisId(null);
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
index 49bb1128b..176637f3f 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
@@ -44,7 +44,7 @@
         </if>
         <!-- 因为体验单、售中单都存在售中，存在两种情况需要计算提成，1、售中单  2、售中自己开的体验单（通过售前是否为NULL或0判断，售前不为空则表示售前开的体验单，不计算售中提成） -->
         <if test="postCode != null and postCode == 'on_sale_id'">
-            AND (order_type = 3 OR (order_type = 2 AND (pre_sale_id IS NULL || pre_sale_id = 0)))
+            AND (order_type = 3 OR order_type = 4 OR (order_type = 2 AND (pre_sale_id IS NULL || pre_sale_id = 0)))
         </if>
         GROUP BY ${column}
     </sql>
diff --git a/stdiet-ui/src/utils/orderType.js b/stdiet-ui/src/utils/orderType.js
index 203321814..0f97a8c75 100644
--- a/stdiet-ui/src/utils/orderType.js
+++ b/stdiet-ui/src/utils/orderType.js
@@ -233,7 +233,7 @@ export function dealOrderModuleshowByOrderType(orderType, moduleshow, form){
           form.operatorId = null;
           form.operatorAssisId = null;
         }
-        
+        moduleshow.onSaleShow = true;
         moduleshow.preSaleShow = false;
         moduleshow.plannerShow = false;
         moduleshow.plannerAssisShow = false;