|
|
@@ -348,7 +348,7 @@
|
|
|
<select id="getMonthAmountOfOrderByType" resultType="java.math.BigDecimal">
|
|
|
select ifnull((sum(o.money) - ifnull(sum(o.refund_money),0))/100,0) from `order_don` o left join `user_distribute_shared`
|
|
|
us on us.user_id = o.user_Id
|
|
|
- left join `user_distribute` ud on ud.user_id = us.shared_id
|
|
|
+ left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
|
|
|
where
|
|
|
<choose>
|
|
|
<when test="type == 1">
|
|
|
@@ -368,7 +368,7 @@
|
|
|
<select id="getMonthGoodsTypeAmountOfOrderByType" resultType="java.math.BigDecimal">
|
|
|
select ifnull((sum(o.money) - ifnull(sum(o.refund_money),0))/100,0) from `order_don` o left join `user_distribute_shared`
|
|
|
us on us.user_id = o.user_Id
|
|
|
- left join `user_distribute` ud on ud.user_id = us.shared_id
|
|
|
+ left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
|
|
|
where
|
|
|
<choose>
|
|
|
<when test="type == 1">
|
|
|
@@ -475,7 +475,7 @@
|
|
|
end) as `type`
|
|
|
from `order_don` o
|
|
|
left join `user_distribute_shared` us on us.user_id = o.user_Id
|
|
|
- left join `user_distribute` ud on ud.user_id = us.shared_id
|
|
|
+ left join `user_distribute` ud on ud.user_id = us.shared_id and ud.deleted is true
|
|
|
where status not in ('close', 'noPayment')
|
|
|
<if test="startDate != null">
|
|
|
and o.created_time >= #{startDate}
|