Merge remote-tracking branch 'origin/feature-201834-wangcz' into feature-201834-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -853,26 +853,28 @@ public class GoodsController {
     /**
      * 通过分页参数获取品牌数量
      *
-     * @param pageable 分页信息
+     * @param params 分页信息
      * @param filter 过滤条件
      * @return Page<BrandCount>
      */
-	@RequestMapping(value = "/brandProductsCount/page", method = RequestMethod.GET)
-    public com.uas.sso.support.Page<BrandCount> getBrandProductsCount(@PageableDefault(value = 20, page = 1) Pageable pageable, GoodsFilter filter) {
+	@RequestMapping(value = "/brandProductsCount/page", method = RequestMethod.POST)
+    public com.uas.sso.support.Page<BrandCount> getBrandProductsCount(PageParams params, @RequestBody GoodsFilter filter) {
         logger.info("后台产品管理", "分页获取品牌数量信息");
-        return goodsService.getBrandProductsCount(pageable, filter);
+        PageInfo info = new PageInfo(params);
+        return goodsService.getBrandProductsCount(info, filter);
     }
 
     /**
      * 通过分页参数获取类目数量
      *
-     * @param pageable 分页参数
+     * @param params 分页参数
      * @param filter 过滤条件
      * @return Page<KindHierarchicalCount>
      */
-    @RequestMapping(value = "/kindProductsCount/page", method = RequestMethod.GET)
-    public com.uas.sso.support.Page<KindHierarchicalCount> getKindProductsCount(@PageableDefault(value = 20, page = 1) Pageable pageable, GoodsFilter filter) {
+    @RequestMapping(value = "/kindProductsCount/page", method = RequestMethod.POST)
+    public com.uas.sso.support.Page<KindHierarchicalCount> getKindProductsCount(PageParams params, @RequestBody GoodsFilter filter) {
         logger.info("后台产品管理", "分页获取类目数量信息");
-        return goodsService.getKindProductsCount(pageable, filter);
+        PageInfo info = new PageInfo(params);
+        return goodsService.getKindProductsCount(info, filter);
     }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3720,6 +3720,15 @@ public class GoodsServiceImpl implements GoodsService {
         if (goodsFilter.getSaleNum() != null && 603 == goodsFilter.getSaleNum()) {
             info.expression(PredicateUtils.eq("reserve", 0, true));
         }
+        if (goodsFilter.getEndTime() != null) {
+            Integer addend = 60 * 60 * 24 * 1000;
+            java.sql.Date endDate = new java.sql.Date(goodsFilter.getEndTime() + addend);
+            info.expression(PredicateUtils.lt("createdDate", endDate, true));
+        }
+        if (goodsFilter.getStartTime() != null) {
+            java.sql.Date startDate = new java.sql.Date(goodsFilter.getEndTime());
+            info.expression(PredicateUtils.gte("createdDate", startDate, true));
+        }
 	}
 
     @Override