submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1047,8 +1047,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }
 
                     if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                            || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                            || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)){
+                            || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                            || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))){
                         tpItems.add(x);
                     }
                 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -457,8 +457,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     }
 
                     if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                            || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                            || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)) {
+                            || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                            || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))) {
                         tpItems.add(x);
                     }
                 }
@@ -724,8 +724,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
 
                 if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                        || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                        || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)) {
+                        || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                        || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))) {
                     tpItems.add(x);
                 }
             }
@@ -2481,8 +2481,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
 
                 if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                        || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                        || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)) {
+                        || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                        || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))) {
                     tpItems.add(x);
                 }
             }
@@ -2868,8 +2868,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         }
 
                         if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                                || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                                || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)) {
+                                || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                                || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))) {
                             tpItems.add(x);
                         }
                     }