Browse Source

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

wanghui 8 years ago
parent
commit
eaedb14b3e
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -903,10 +903,10 @@
     from t_order where delete_sign = 0
     <choose>
     	<when test="intentionStatus == 0"><!-- 意向订单 -->
-    		and intention_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    		and order_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</when>
     	<otherwise>
-    		and intention_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    		and order_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</otherwise>
     </choose>
     order by create_time desc
@@ -921,10 +921,10 @@
   	from t_order where delete_sign = 0
     <choose>
     	<when test="intentionStatus == 0"><!-- 意向订单 -->
-    		and intention_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    		and order_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</when>
     	<otherwise>
-    		and intention_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
+    		and order_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
     	</otherwise>
     </choose>
   </select>