long 序列化

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

@@ -84,7 +84,12 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
                     } else {
                         canUserServeIds.retainAll(orderServeList.stream()
                                 .filter(orderServe -> orderServe.getBindCoupon() == 2)
-                                .filter(orderServe -> orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1)
+                                .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)
                                 .map(OrderServe::getServeId)

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

@@ -634,7 +634,12 @@ public class MarketServiceImpl implements MarketService {
                     .filter(orderServe -> serveIds.contains(orderServe.getServeId()))
                     .filter(orderServe -> orderServe.getLeisureDiscountConfigId() == null || orderServe.getLeisureDiscountConfigId() == 0)
                     .filter(orderServe -> orderServe.getProducePromotionTimeId() == null)
-                    .filter(orderServe -> orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1)
+                    .filter(orderServe -> {
+                        if (orderServe.getProduceId() != null) {
+                            return orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1;
+                        }
+                        return true;
+                    })
                     .filter(orderServe -> orderServe.getBindCoupon() == 2)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
@@ -659,7 +664,12 @@ public class MarketServiceImpl implements MarketService {
                 .filter(orderServe -> serveIds.contains(orderServe.getServeId()))
                 .filter(orderServe -> orderServe.getLeisureDiscountConfigId() == null || orderServe.getLeisureDiscountConfigId() == 0)
                 .filter(orderServe -> orderServe.getProducePromotionTimeId() == null)
-                .filter(orderServe -> orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1)
+                .filter(orderServe -> {
+                    if (orderServe.getProduceId() != null) {
+                        return orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1;
+                    }
+                    return true;
+                })
                 .filter(orderServe -> orderServe.getBindCoupon() == 2)
                 .max(Comparator.comparing(OrderServe::getPayPrice))
                 .orElse(null);

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

@@ -183,7 +183,12 @@ public class TimesCardController {
 
                     canUserServeIds.retainAll(orderServeList.stream()
                             .filter(orderServe -> orderServe.getBindCoupon() == 2)
-                            .filter(orderServe -> orderServe.getProduceCurrentPrice().compareTo(orderServe.getProduceBargainPrice()) > -1)
+                            .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)
                             .map(OrderServe::getServeId)