|
@@ -824,6 +824,12 @@
|
|
|
AND s.pay_status in (2,3,4)
|
|
AND s.pay_status in (2,3,4)
|
|
|
AND o.`status` = 1
|
|
AND o.`status` = 1
|
|
|
AND g.goods_type = 8
|
|
AND g.goods_type = 8
|
|
|
|
|
+ <if test="status != null and status.size()!=0 ">
|
|
|
|
|
+ AND g.status in
|
|
|
|
|
+ <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
|
|
|
|
|
+ #{item}
|
|
|
|
|
+ </foreach>
|
|
|
|
|
+ </if>
|
|
|
<if test="userId != null and userId !=''">
|
|
<if test="userId != null and userId !=''">
|
|
|
AND o.user_id = #{userId}
|
|
AND o.user_id = #{userId}
|
|
|
</if>
|
|
</if>
|
|
@@ -930,6 +936,12 @@
|
|
|
AND s.pay_status in (2,3,4)
|
|
AND s.pay_status in (2,3,4)
|
|
|
AND o.`status` = 1
|
|
AND o.`status` = 1
|
|
|
AND g.goods_type = 6
|
|
AND g.goods_type = 6
|
|
|
|
|
+ <if test="status != null and status.size()!=0 ">
|
|
|
|
|
+ AND g.status in
|
|
|
|
|
+ <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
|
|
|
|
|
+ #{item}
|
|
|
|
|
+ </foreach>
|
|
|
|
|
+ </if>
|
|
|
<if test="userId != null and userId !=''">
|
|
<if test="userId != null and userId !=''">
|
|
|
AND o.user_id = #{userId}
|
|
AND o.user_id = #{userId}
|
|
|
</if>
|
|
</if>
|