|
|
@@ -894,7 +894,10 @@
|
|
|
on o.order_no=e.order_no where delete_sign = 0
|
|
|
and approval in (0,2)
|
|
|
<if test="o.outsource != null">
|
|
|
- and outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ and o.outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
+ <if test="o.outsource == 1">
|
|
|
+ and f.refund_status=1
|
|
|
</if>
|
|
|
and process_status >= 2
|
|
|
<if test="o.processStatus == 2">
|
|
|
@@ -935,7 +938,10 @@
|
|
|
select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
|
|
|
where delete_sign = 0 and approval in (0,2)
|
|
|
<if test="o.outsource != null">
|
|
|
- and outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ and o.outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ </if>
|
|
|
+ <if test="o.outsource == 1">
|
|
|
+ and f.refund_status=1
|
|
|
</if>
|
|
|
and process_status >= 2
|
|
|
<if test="o.processStatus == 2">
|