ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 87adbdcfaa65b8d872251894f0a61860279ffb63 1 parent 54c30e78

Revert "fix common seller can not see orders of waiting pay" 

This reverts commit 54c30e78.
Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <select id="selectNotEntryCntByUidStatusGBSkc" resultType="java.lang.Integer"> 76 <select id="selectNotEntryCntByUidStatusGBSkc" resultType="java.lang.Integer">
77 SELECT COUNT(*) from (select sog.id FROM seller_order_goods sog,seller_order so 77 SELECT COUNT(*) from (select sog.id FROM seller_order_goods sog,seller_order so
78 WHERE sog.id = so.skup and sog.uid = #{uid,jdbcType=INTEGER} and sog.is_del = 1 78 WHERE sog.id = so.skup and sog.uid = #{uid,jdbcType=INTEGER} and sog.is_del = 1
79 - AND (so.payment != 11 or so.payment is null) 79 + AND so.payment != 11
80 <if test="statusList != null"> 80 <if test="statusList != null">
81 and sog.status in 81 and sog.status in
82 <foreach item="status" index="index" collection="statusList" open="(" separator="," close=")"> 82 <foreach item="status" index="index" collection="statusList" open="(" separator="," close=")">
@@ -88,8 +88,7 @@ @@ -88,8 +88,7 @@
88 88
89 <select id="selectNotEntryListByUidStatusGBSkc" resultMap="BaseResultMap"> 89 <select id="selectNotEntryListByUidStatusGBSkc" resultMap="BaseResultMap">
90 SELECT <include refid="Base_Column_List_with_table_name" /> FROM seller_order_goods sog,seller_order so 90 SELECT <include refid="Base_Column_List_with_table_name" /> FROM seller_order_goods sog,seller_order so
91 - WHERE sog.id = so.skup and sog.uid = #{uid,jdbcType=INTEGER} and sog.is_del = 1  
92 - AND (so.payment != 11 or so.payment is null) 91 + WHERE sog.id = so.skup and sog.uid = #{uid,jdbcType=INTEGER} and sog.is_del = 1 AND so.payment != 11
93 <if test="statusList != null"> 92 <if test="statusList != null">
94 and sog.status in 93 and sog.status in
95 <foreach item="status" index="index" collection="statusList" open="(" separator="," close=")"> 94 <foreach item="status" index="index" collection="statusList" open="(" separator="," close=")">