Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松
2025-01-06 11:25:13 +08:00
3 changed files with 16 additions and 15 deletions

View File

@@ -205,7 +205,8 @@
</select>
<select id="selectOrdersMoney" resultType="Double">
select ifnull(sum(pay_money),0.00) from orders where 1=1
select sum(pay_money) from orders
where 1=1
<if test="sysUserId!=null">
and sys_user_id=#{sysUserId}
</if>
@@ -232,16 +233,13 @@
<select id="selectFenXiaoMoney" resultType="Double">
select
<if test="type==1">
ifnull(sum(one_money),0.00)
sum(ifnull(one_money,0.00))
</if>
<if test="type==2">
ifnull(sum(two_money),0.00)
sum(ifnull(two_money,0.00))
</if>
<if test="type==3">
ifnull(sum(qd_money),0.00)
</if>
<if test="type==4">
ifnull(sum(one_money),0.00)+ifnull(sum(two_money),0.00)+ifnull(sum(qd_money),0.00)
sum(ifnull(qd_money,0.00))
</if>
from orders
where status=1