Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提成优化，需要加上更换订单提成详情

Browse Source
This commit is contained in:
xiezhijun
2021-05-28 00:46:21 +08:00
parent e333cb007e
commit 0122c35553
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@@ -441,9 +441,9 @@
and (
su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId}
<!-- 是否查询根据用户ID查询对应替换订单 -->
<if test="replaceOrderFlag != null">
<!--<if test="replaceOrderFlag != null">-->
or o.order_id in (select r.order_id from sys_order_nutritionist_replace_record r where r.del_flag = 0 and (r.after_sale_id = #{userId} or r.nutritionist_id = #{userId}) )
</if>
<!--</if>-->
)
</if>
<if test="endTime != null and endTime != ''">
@@ -469,7 +469,13 @@
and review_status = #{reviewStatus}
</if>
<if test="userId != null"><!-- 限于营养师、售后不可能同一个的情况下 -->
and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId})
and (
su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId}
<!-- 是否查询根据用户ID查询对应替换订单 -->
<!--<if test="replaceOrderFlag != null">-->
or o.order_id in (select r.order_id from sys_order_nutritionist_replace_record r where r.del_flag = 0 and (r.after_sale_id = #{userId} or r.nutritionist_id = #{userId}) )
<!--</if>-->
)
</if>
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT(o.order_time,'%Y-%m-%d') &lt;= #{endTime}