update

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -137,7 +137,7 @@ public class OrderController extends Controller {
         TbCfItemSkus itemSkus = skuOptional.get();
         BigDecimal orderPrice = itemSkus.getSkuPrice().multiply(new BigDecimal(itemNum));
         //校验优惠券是否可用
-        if (StringUtils.isBlank(toitableId)) {
+        if (!StringUtils.isBlank(toitableId)) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(code, "Coupon invalid !");
@@ -173,7 +173,8 @@ public class OrderController extends Controller {
 
     public boolean checkCoupon(String couponId, BigDecimal orderPrice) {
         logger.info("orderPrice:" + orderPrice);
-        Optional<TbCfToicoupon> byId = toicouponRepository.findById(couponId);
+        logger.info("user:" + user.userId());
+        Optional<TbCfToicoupon> byId = toicouponRepository.checkCouponAvailable(user.userId(), couponId);
         if (byId.isPresent()) {
             TbCfToicoupon coupon = byId.get();
             logger.info("amout:" + coupon.deductAmount());
@@ -197,7 +198,7 @@ public class OrderController extends Controller {
         Map<String, Object> couponMap = queryUserAvailableCoupons(orderPrice);
         int code = ResultCodeEnum.VALIDATE_ERROR.getCode();
         //校验优惠券是否可用
-        if (StringUtils.isBlank(toitableId)) {
+        if (!StringUtils.isBlank(toitableId)) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(code, "Coupon invalid !");
@@ -317,7 +318,7 @@ public class OrderController extends Controller {
             }
         }
         //校验优惠券是否可用
-        if (StringUtils.isBlank(toitableId)) {
+        if (!StringUtils.isBlank(toitableId)) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(v_code, "Coupon invalid !");

src/main/java/com/example/afrishop_v3/repository/TbCfToicouponRepository.java

@@ -6,8 +6,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
+import java.util.Optional;
 
-public interface TbCfToicouponRepository extends PagingAndSortingRepository<TbCfToicoupon,String> {
+public interface TbCfToicouponRepository extends PagingAndSortingRepository<TbCfToicoupon, String> {
     @Query("select a from #{#entityName} a WHERE a.enableFlag = 1 and a.userId = :user_id and CURRENT_TIMESTAMP between a.startTime and a.endTime order by a.coupon.deductAmount desc,a.toitableId asc ")
     List<TbCfToicoupon> queryUserAvailableCoupon(@Param("user_id") String userId);
 
@@ -16,4 +17,7 @@ public interface TbCfToicouponRepository extends PagingAndSortingRepository<TbCf
 
     @Query("select a from #{#entityName} a WHERE a.enableFlag = 1 and a.userId = :user_id and CURRENT_TIMESTAMP not between a.startTime and a.endTime order by a.coupon.deductAmount desc ")
     List<TbCfToicoupon> queryUserExpiredCoupon(@Param("user_id") String userId);
+
+    @Query("select a from #{#entityName} a WHERE a.enableFlag = 1 and a.userId = :user_id and CURRENT_TIMESTAMP between a.startTime and a.endTime and a.toitableId=:toitableId")
+    Optional<TbCfToicoupon> checkCouponAvailable(@Param("user_id") String userId, @Param("toitableId") String toitableId);
 }