修复订单查询2

src/main/resources/mapper/TbCfOrderDao.xml

@@ -251,41 +251,42 @@
 
 	<!--获取用户订单数据-->
 	<select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
-			select
-			o.order_id,
-			o.order_no,
-			o.order_name,
-			o.order_time,
-			r.update_time,
-			o.deal_time,
-			r.close_time,
-			r.order_status,
-			o.user_id,
-			o.user_name,
-			o.delivery_address_id,
-			o.delivery_address,
-			o.delivery_name,
-			o.delivery_phone,
-			o.items_price,
-			o.total_price,
-			o.reality_pay,
-			r.delivery_flag,
-			r.delivery_time,
-			o.express_cost,
-			o.coupon_id,
-			o.coupon_title,
-			o.coupon_price,
-			o.fee,
-			o.tax,
-			o.pay_id,
-			o.pay_status,
-			o.enable_flag,
-			o.descripition_name
-	from tb_cf_order o
-	left join tb_cf_item_order_r r on o.order_id=r.order_id
-	where  o.user_id=#{userId}  and o.enable_flag=1
-		<if test="orderStatus  != null">and r.order_status = #{orderStatus}</if>
-	order by o.order_time desc
+        select
+        DISTINCT
+        o.order_id,
+        o.order_no,
+        o.order_name,
+        o.order_time,
+        r.update_time,
+        o.deal_time,
+        r.close_time,
+        r.order_status,
+        o.user_id,
+        o.user_name,
+        o.delivery_address_id,
+        o.delivery_address,
+        o.delivery_name,
+        o.delivery_phone,
+        o.items_price,
+        o.total_price,
+        o.reality_pay,
+        r.delivery_flag,
+        o.delivery_time,
+        o.express_cost,
+        o.coupon_id,
+        o.coupon_title,
+        o.coupon_price,
+        o.fee,
+        o.tax,
+        o.pay_id,
+        o.pay_status,
+        o.enable_flag,
+        o.descripition_name
+        from tb_cf_order o
+        left join tb_cf_item_order_r r on o.order_id=r.order_id
+        where  o.user_id=#{userId} and o.enable_flag=1
+        <if test="orderStatus  != null">and r.order_status = #{orderStatus}</if>
+        order by o.order_time desc
 	</select>
 	<select id="getOrdersId"  resultType="String">
         	select r.order_item_id ordersId from tb_cf_item_order_r r where   r.order_id=#{orderId} and r.item_id=#{itemId}