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

订单优化、提成分为审核、未审核

Browse Source
This commit is contained in:
xiezhijun
2021-03-01 19:00:01 +08:00
parent 7539ec6b7f
commit f92e07f1ed
21 changed files with 207 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,8 @@
</if>
</if>
<if test="true">and del_flag = 0</if>
<!-- 计算总额时需要除去二开售后提成单 -->
AND after_sale_commiss_order = 0
</where>
</select>
@ -139,6 +141,26 @@
and 0 > amount
</if>
</if>
<if test="searchOrderTypeArray != null">
<trim prefix="AND (" suffix=")" suffixOverrides="or">
<foreach collection="searchOrderTypeArray" separator="or" item="typeArray" index="i">
(
<foreach collection="typeArray" separator="and" item="type" index="j">
<if test="j == 0">
order_type = #{type}
</if>
<if test="j == 1">
order_count_type = #{type}
</if>
<if test="j == 2">
order_money_type = #{type}
</if>
</foreach>
)
<!--(order_type = #{typeArray[0]} and order_count_type = #{typeArray[1]} and order_money_type =#{typeArray[2]})-->
</foreach>
</trim>
</if>
<if test="true">and o.del_flag = 0</if>
</where>
order by order_time desc
@ -365,7 +387,10 @@
from sys_order o
left join sys_user su_sale on su_sale.user_id = o.after_sale_id and su_sale.del_flag = 0
left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id and su_nutritionist.del_flag = 0
where review_status = 'yes' and o.order_time >= '2021-01-01' and o.del_flag = 0
where o.order_time >= '2021-01-01' and o.del_flag = 0
<if test="reviewStatus != null and reviewStatus != ''">
and review_status = #{reviewStatus}
</if>
<if test="userId != null">
and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId})
</if>