售中体验单提成计算、高血糖血压问卷优化

2021-06-24 16:23:43 +08:00
parent 64cfe472bc
commit b24571fe40
8 changed files with 73 additions and 32 deletions
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
@ -42,9 +42,9 @@
        <if test="endTime != null and endTime != ''">AND date_format(order_time,'%y%m%d') &lt;=
            date_format(${endTime},'%y%m%d')
        </if>
-        <!-- 因为体验单、售中单都存在售中，所以售中的提成金额只计算售中单的，不计算体验单 -->
+        <!-- 因为体验单、售中单都存在售中，存在两种情况需要计算提成，1、售中单  2、售中自己开的体验单（通过售前是否为NULL或0判断，售前不为空则表示售前开的体验单，不计算售中提成） -->
        <if test="postCode != null and postCode == 'on_sale_id'">
-            and order_type = 3
+            AND (order_type = 3 OR (order_type = 2 AND (pre_sale_id IS NULL || pre_sale_id = 0)))
        </if>
        GROUP BY ${column}
    </sql>