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

Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
huangdeliang
2021-03-01 19:04:14 +08:00
parent 3d20c30edc f92e07f1ed
commit 4dd7a6f643
21 changed files with 207 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml
View File

@@ -32,7 +32,9 @@
SELECT ${column} AS user_id, ${postId} AS post_id, SUM(amount) AS amount
FROM sys_order
WHERE ${column} IS NOT NULL AND ${column} <> 0 AND del_flag = 0
AND review_status = 'yes'
<if test="reviewStatus != null and reviewStatus != ''">
AND review_status = #{reviewStatus}
</if>
<if test="beginTime != null and beginTime != ''">AND date_format(order_time,'%y%m%d') &gt;=
date_format(${beginTime},'%y%m%d')
</if>
@@ -47,6 +49,7 @@
JOIN (
<include refid="groupAmountVo">
<property name="column" value="pre_sale_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="5"/>
@@ -54,6 +57,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="after_sale_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="6"/>
@@ -61,6 +65,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="nutritionist_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="9"/>
@@ -68,6 +73,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="nutri_assis_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="10"/>
@@ -75,6 +81,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="operator_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="11"/>
@@ -82,6 +89,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="operator_assis_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="13"/>
@@ -89,6 +97,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="planner_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="7"/>
@@ -96,6 +105,7 @@
UNION
<include refid="groupAmountVo">
<property name="column" value="planner_assis_id"/>
<property name="reviewStatus" value="#{reviewStatus}"/>
<property name="beginTime" value="#{beginTime}"/>
<property name="endTime" value="#{endTime}"/>
<property name="postId" value="8"/>
@@ -188,7 +198,8 @@
</foreach>
</delete>
<select id="selectSysCommisionDayDetail" parameterType="SysCommision" resultMap="SysCommisionResult">
<!-- 查询售后和营养师 -->
<select id="getAfterSaleAndNutri" parameterType="SysCommision" resultMap="SysCommisionResult">
SELECT su.user_id,su.nick_name as user_name,sp.post_id, sp.post_code,sp.post_name FROM sys_user su
LEFT JOIN sys_user_post sup ON sup.user_id = su.user_id
LEFT JOIN sys_post sp ON sp.post_id = sup.post_id

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>