fix 不展示优惠码优惠券

netflix-dao/src/main/resources/mapper/CouponUserMapper.xml

@@ -34,6 +34,7 @@
         </if>
         and cu.status != 'used'
         where cu.user_id = #{userId}
+        and cu.channel != 'exCode'
         <if test="couponId == null">
             order by isAvailable desc
         </if>
@@ -56,6 +57,7 @@
         </if>
         and cu.user_id = #{userId}
         and cu.status = 'unused'
+        and cu.channel != 'exCode'
         <if test="isRenew != null and isRenew">
             and cp.is_renew = #{isRenew}
         </if>

netflix-service/src/main/java/com/cyksj/service/coupon/CouponFontService.java

@@ -2,6 +2,7 @@ package com.cyksj.service.coupon;
 
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cyksj.model.entity.CouponUser;
 import com.cyksj.model.request.CouponCollectReq;
 import com.cyksj.model.views.CouponUserView;
 import com.ejlchina.searcher.SearchResult;
@@ -44,4 +45,9 @@ public interface CouponFontService {
 	void setCouponUserStatus(CouponUserView data, DateTime now);
 
 	Integer collectRecommendCouponNum(Long userId);
+
+	/**
+	 * 更新优惠券有效时间
+	 */
+	void updateCouponUserValidTime(Long couponId, CouponUser couponUser);
 }

netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -74,7 +74,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 		couponUser.setStatus(CouponUser.Status.unused);
 		couponUser.setCouponActiveId(couponCollectReq.getCouponActiveId());
 		//优惠券有效时间
-		updateCouponUserValidTime(couponActive.getCouponId(), couponUser);
+		this.updateCouponUserValidTime(couponActive.getCouponId(), couponUser);
 		try {
 			couponUserMapper.insert(couponUser);
 		} catch (DuplicateKeyException e) {
@@ -103,7 +103,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 		couponUser.setStatus(CouponUser.Status.unused);
 		couponUser.setRecommendId(couponCollectReq.getCouponRecommendId());
 		//优惠券有效时间
-		updateCouponUserValidTime(couponCollectReq.getCouponId(), couponUser);
+		this.updateCouponUserValidTime(couponCollectReq.getCouponId(), couponUser);
 		try {
 			couponUserMapper.insert(couponUser);
 		} catch (DuplicateKeyException e) {
@@ -133,7 +133,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 			couponUser.setStatus(CouponUser.Status.unused);
 			couponUser.setRecommendId(data.getRecommendId());
 			//优惠券有效时间
-			updateCouponUserValidTime(data.getCouponId(), couponUser);
+			this.updateCouponUserValidTime(data.getCouponId(), couponUser);
 			try {
 				couponUserMapper.insert(couponUser);
 			} catch (DuplicateKeyException e) {
@@ -253,6 +253,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 		}
 	}
 
+	@Override
 	public void updateCouponUserValidTime(Long couponId, CouponUser couponUser) {
 		Coupon coupon = couponMapper.selectById(couponId);
 		if (coupon.getIsValidTime()) {

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1072,6 +1072,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			couponUser.setUserId(userId);
 			couponUser.setStatus(CouponUser.Status.used);
 			couponUser.setChannel(CouponUser.Channel.exCode);
+			couponFontService.updateCouponUserValidTime(couponId, couponUser);
 			try {
 				couponUserMapper.insert(couponUser);
 			} catch (DuplicateKeyException e) {

netflix-web/src/main/java/com/cyksj/web/controller/coupon/CouponFrontController.java

@@ -73,6 +73,7 @@ public class CouponFrontController {
 		SearchResult<CouponUserView> search = beanSearcher.search(CouponUserView.class,
 				MapUtils.flatBuilder(request.getParameterMap())
 						.field(CouponUserView::getUserId, userId)
+						.field(CouponUserView::getChannel, CouponUser.Channel.exCode).op(Operator.NotEqual)
 						.orderBy(CouponUserView::getOrderBy).asc()
 						.build());
 		couponFontService.handleCouponStatus(search);