商铺排序

src/main/java/com/diaoyun/zion/chinafrica/vo/UserCouponVo.java

@@ -48,7 +48,6 @@ public class UserCouponVo {
         return expiredCouponList;
     }
 
-    public void setExpiredCouponList(List<TbCfCouponEntity> expiredCouponList) {
-        this.expiredCouponList = expiredCouponList;
+    public void setExpiredCouponList(List<TbCfCouponEntity> expiredCouponList) {this.expiredCouponList = expiredCouponList;
     }
 }

src/main/resources/mapper/TbCfCouponDao.xml

@@ -187,7 +187,7 @@
 	</delete>
     <!--查询用户所有有效的优惠券-->
 	<select id="queryUserAvailableCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-        select DISTINCT
+         select DISTINCT
         t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,
@@ -209,10 +209,12 @@
 		t2.create_time,
 		t2.update_user_id,
 		t2.update_time
-        from tb_cf_take_coupon t1,tb_cf_coupon t2,tb_cf_issue_coupon t3,tb_cf_coupon_category t4
-         where	 ((t3.user_id=#{userId}  and t3.coupon_id=t2.coupon_id    and t2.status=1  and t3.enable_flag=1)
-         or (t1.user_id=#{userId}  and t1.coupon_id=t2.coupon_id    and t2.status=1  and t1.enable_flag=1))
-		and <![CDATA[ t2.valid_start_time<=#{nowTime}]]>  and <![CDATA[t2.valid_end_time>=#{nowTime}]]>
+        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
+				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
+				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
+			  where ((t1.user_id=#{userId} and t1.enable_flag=1 )
+				or (t3.user_id=#{userId} and t3.enable_flag=1))
+				and t2.status=1 	and <![CDATA[ t2.valid_start_time<=#{nowTime}]]>  and <![CDATA[t2.valid_end_time>=#{nowTime}]]>
     </select>
 
     <!--更改优惠券统计-->
@@ -223,7 +225,7 @@
 	<!--获取已使用的优惠券-->
 	<select id="queryUserUsedCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		select DISTINCT
-		t2.coupon_id,
+        t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,
 		t2.coupon_use,
@@ -244,14 +246,16 @@
 		t2.create_time,
 		t2.update_user_id,
 		t2.update_time
-		 from tb_cf_take_coupon t1,tb_cf_coupon t2 ,tb_cf_issue_coupon t3,tb_cf_coupon_category t4
-		where ((t1.user_id=#{userId} and t1.coupon_id=t2.coupon_id and t1.enable_flag=0)
-		or (t3.user_id=#{userId} and t3.coupon_id=t2.coupon_id and t3.enable_flag=0))
+        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
+				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
+				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
+		where (t1.user_id=#{userId} and t1.enable_flag=0)
+		or (t3.user_id=#{userId} and t3.enable_flag=0)
 	</select>
 	<!--获取已过期的优惠券-->
 	<select id="queryUserExpiredoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		select   DISTINCT
-		t2.coupon_id,
+		select DISTINCT
+        t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,
 		t2.coupon_use,
@@ -271,9 +275,12 @@
 		t2.create_user_id,
 		t2.create_time,
 		t2.update_user_id,
-		t2.update_time from tb_cf_take_coupon t1,tb_cf_coupon t2 ,tb_cf_issue_coupon t3,tb_cf_coupon_category t4
-		where ((t1.user_id=#{userId} and t1.coupon_id=t2.coupon_id  and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t1.enable_flag=1)
-		or (t1.user_id=#{userId} and t1.coupon_id=t2.coupon_id  and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t1.enable_flag=1))
+		t2.update_time
+        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
+				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
+				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
+		where ((t1.user_id=#{userId}   and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t1.enable_flag=1)
+		or (t1.user_id=#{userId} and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t1.enable_flag=1))
 	</select>
 
 	<!--根据优惠券种类获取发放中的优惠券-->