Browse Source

Goods查询增加是否有价格过滤

hejq 7 years ago
parent
commit
c1b82f126f

+ 13 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/model/GoodsFilter.java

@@ -87,6 +87,11 @@ public class GoodsFilter {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Long endTime;
 
+    /**
+     * 是否有价格
+     */
+    private Boolean havePrice;
+
     public String getCode() {
         return code;
     }
@@ -198,4 +203,12 @@ public class GoodsFilter {
     public void setEndTime(Long endTime) {
         this.endTime = endTime;
     }
+
+    public Boolean getHavePrice() {
+        return havePrice;
+    }
+
+    public void setHavePrice(Boolean havePrice) {
+        this.havePrice = havePrice;
+    }
 }

+ 9 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3765,6 +3765,15 @@ public class GoodsServiceImpl implements GoodsService {
                         PredicateUtils.eq("uuid", StringConstant.BLANK, true)));
             }
         }
+        if (goodsFilter.getHavePrice() != null) {
+            if (goodsFilter.getHavePrice()) {
+                info.expression(PredicateUtils.and(PredicateUtils.isNotNull("qtyPrice"),
+                        PredicateUtils.ne("qtyPrice", StringConstant.BLANK, true)));
+            } else {
+                info.expression(PredicateUtils.or(PredicateUtils.isNull("qtyPrice"),
+                        PredicateUtils.eq("qtyPrice", StringConstant.BLANK, true)));
+            }
+        }
         if (goodsFilter.getAudited() != null) {
             info.expression(PredicateUtils.isNotNull("audited"));
             info.expression(PredicateUtils.eq("audited", goodsFilter.getAudited(), true));