修复优惠券分类sql

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java

@@ -58,10 +58,9 @@ public class TbCfCouponController {
     public Result<CouponItem> queryCouponByUserId(@ApiParam("用户Id")@PathVariable("userId") String userId) {
         return tbCfIssueCouponService.queryCouponByUserId(userId);
     }
-   /* @ApiOperation("更改优惠券状态")
+ /*   @ApiOperation("更改优惠券状态")
     @GetMapping("/changCouponStatus/{userId}/{couponId}")
     public Result changCouponStatus(@ApiParam("用户Id")@PathVariable("userId") String userId,@ApiParam("优惠券Id")@PathVariable("couponId") String couponId){
         return tbCfIssueCouponService.changeCouponStatus(userId,couponId);
     }*/
-
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -741,6 +741,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         List<TbCfCouponEntity> usableCouponList = new ArrayList<>();
         //不可用优惠券
         List<TbCfCouponEntity> unusableCouponList = new ArrayList<>();
+
         BigDecimal itemsPrice = tbCfOrder.getItemsPrice();
         for (TbCfCouponEntity tbCfCoupon : tbCfCouponList) {
             if (itemsPrice.compareTo(tbCfCoupon.getWithAmount()) >= 0) {

src/main/resources/mapper/TbCfCouponDao.xml

@@ -49,7 +49,8 @@
 			`create_user_id`,
 			`create_time`,
 			`update_user_id`,
-			`update_time`
+			`update_time`,
+			`coupon_vaild`
 		from tb_cf_coupon a left join tb_cf_coupon_category b on a.coupon_category_id = b.coupon_category_id
 		where coupon_id = #{id}
 	</select>
@@ -76,7 +77,8 @@
 		`create_user_id`,
 		`create_time`,
 		`update_user_id`,
-		`update_time`
+		`update_time`,
+		`coupon_vaild`
 		from tb_cf_coupon a left join tb_cf_coupon_category b on a.coupon_category_id = b.coupon_category_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -124,7 +126,8 @@
 			`create_user_id`,
 			`create_time`,
 			`update_user_id`,
-			`update_time`)
+			`update_time`,
+			`coupon_vaild`)
 		values(
 			#{couponId},
 			#{couponCategoryId},
@@ -145,7 +148,8 @@
 			#{createUserId},
 			#{createTime},
 			#{updateUserId},
-			#{updateTime})
+			#{updateTime}),
+			#{coupon_vaild})
 	</insert>
 
 	<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
@@ -170,6 +174,7 @@
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="updateUserId != null">`update_user_id` = #{updateUserId}, </if>
 			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+			<if test="couponVaild != null">`coupon_vaild` = #{couponVaild}</if>
 		</set>
 		where coupon_id = #{couponId}
 	</update>
@@ -188,8 +193,10 @@
 	</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,
@@ -210,14 +217,18 @@
 		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	 ((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}]]>
+		t2.update_time,
+		t2.coupon_vaild
+        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>
 
-    <!--更改优惠券统计-->
+
+	<!--更改优惠券统计-->
 	<update id="updateUsedCount">
 		update tb_cf_coupon set used_count=used_count+1 where coupon_id=#{couponId}
 	</update>
@@ -225,7 +236,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,
@@ -245,15 +256,19 @@
 		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 t1.enable_flag=0)
-		or (t3.user_id=#{userId} and t3.coupon_id=t2.coupon_id and t3.enable_flag=0))
+		t2.update_time,
+		t2.coupon_vaild
+        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,
@@ -273,11 +288,16 @@
 		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,
+		t2.coupon_vaild
+        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 (t3.user_id=#{userId} and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t3.enable_flag=1))
 	</select>
 
+
 	<select id="getCouponAndVaildAll" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		select
 		 `coupon_id`,