Browse Source

app 订单修改

wanghui 8 years ago
parent
commit
9c2aba0999

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

@@ -902,11 +902,11 @@
     <include refid="Base_Column_List" />
     from t_order where delete_sign = 0
     <choose>
-    	<when test="intentionStatus == 0"><!-- 意向订单 -->
-    		and order_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    	<when test="orderStatus == 0"><!-- 意向订单 -->
+    		and order_status = 1 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</when>
     	<otherwise>
-    		and order_status != 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    		and order_status != 1 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</otherwise>
     </choose>
     order by create_time desc
@@ -920,11 +920,11 @@
   		count(0) 
   	from t_order where delete_sign = 0
     <choose>
-    	<when test="intentionStatus == 0"><!-- 意向订单 -->
-    		and order_status = 0 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
+    	<when test="orderStatus == 0"><!-- 意向订单 -->
+    		and order_status = 1 and (buyer_id = #{uid,jdbcType=VARCHAR} or seller_id =  #{uid,jdbcType=VARCHAR})
     	</when>
     	<otherwise>
-    		and order_status != 0  and buyer_id = #{uid,jdbcType=VARCHAR}
+    		and order_status != 1  and buyer_id = #{uid,jdbcType=VARCHAR}
     	</otherwise>
     </choose>
   </select>

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -644,7 +644,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	public Pagination<C2BOrderDetailBo> selectOrderList(boolean confirm,Integer pageNo,Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Pagination<C2BOrderDetailBo> result = new Pagination<C2BOrderDetailBo>();
-		//if(!confirm) params.put("intentionStatus", IntentionSate.WAIT_SELLER_CONFIRM.getCode()); //购买意向
+		if(!confirm) params.put("orderStatus", OrderState.WAIT_FOR_CONFIRM.getCode()); //购买意向
 		params.put("uid", TokenManager.getUserId());
 		Pagination<TOrder> data = (Pagination<TOrder>)findPage("selectOrderListByPage", "selectOrderListCount", params, pageNo, pageSize);
 		List<TOrder> list = (List<TOrder>)data.getList();