update

src/main/java/com/gogirl/application/market/impl/CouponCustomerRelevanceServiceImpl.java

@@ -86,14 +86,8 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
                                 .filter(orderServe -> {
                                     return orderServe.getBindCoupon() == 2;
                                 })
-                                .filter(orderServe -> {
-                                    if (orderServe.getProduceId() != null) {
-                                        return orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1;
-                                    }
-                                    return true;
-                                })
-                                .filter(orderServe -> orderServe.getProducePromotionTimeId() == null)
-                                .filter(orderServe -> orderServe.getLeisureDiscountConfigId() == null || orderServe.getLeisureDiscountConfigId() == 0)
+                                //不是活动价格
+                                .filter(orderServe -> !orderServe.isActivity())
                                 .map(OrderServe::getServeId)
                                 .collect(Collectors.toList()));
                     }

src/main/java/com/gogirl/application/market/impl/CouponServiceImpl.java

@@ -225,14 +225,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                     List<Integer> canUserServeIds = couponCustomerRelevanceMapper.queryCouponCustomerServeRelevance(coupon.getId());
                     canUserServeIds.retainAll(orderServeList.stream()
                             .filter(orderServe -> orderServe.getBindCoupon() == 2)
-                            .filter(orderServe -> {
-                                if (orderServe.getProduceId() != null) {
-                                    return orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1;
-                                }
-                                return true;
-                            })
-                            .filter(orderServe -> orderServe.getProducePromotionTimeId() == null)
-                            .filter(orderServe -> orderServe.getLeisureDiscountConfigId() == null || orderServe.getLeisureDiscountConfigId() == 0)
+                            .filter(orderServe -> !orderServe.isActivity())
                             .map(OrderServe::getServeId)
                             .collect(Collectors.toList()));
                     coupon.setCanBeUse(ListUtil.isNotEmpty(canUserServeIds));

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -233,6 +233,6 @@ public class OrderServe implements Serializable {
     public Boolean isActivity() {
         return price.equals(leisurePrice) ||
                 price.equals(promotionPrice) ||
-                (price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) > -1);
+                (price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) < 0);
     }
 }
\ No newline at end of file

src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java

@@ -210,6 +210,6 @@ public class ScheduleServe implements Serializable {
     public Boolean isActivity() {
         return price.equals(leisurePrice) ||
                 price.equals(promotionPrice) ||
-                (price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) > -1);
+                (price.equals(produceCurrentPrice) && produceCurrentPrice.compareTo(produceBargainPrice) < 0);
     }
 }

src/main/java/com/gogirl/interfaces/user/TimesCardController.java

@@ -183,14 +183,7 @@ public class TimesCardController {
 
                     canUserServeIds.retainAll(orderServeList.stream()
                             .filter(orderServe -> orderServe.getBindCoupon() == 2)
-                            .filter(orderServe -> {
-                                if (orderServe.getProduceId() != null) {
-                                    return orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1;
-                                }
-                                return true;
-                            })
-                            .filter(orderServe -> orderServe.getProducePromotionTimeId() == null)
-                            .filter(orderServe -> orderServe.getLeisureDiscountConfigId() == null || orderServe.getLeisureDiscountConfigId() == 0)
+                            .filter(orderServe -> !orderServe.isActivity())
                             .map(OrderServe::getServeId)
                             .collect(Collectors.toList()));
                     timesCardCustomerRelevance.setCanBeUse(ListUtil.isNotEmpty(canUserServeIds));