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/model/GoodsFilter.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 /**
  * 超级后台产品管理过滤类，由于过滤属性太多
  *
@@ -70,11 +72,13 @@ public class GoodsFilter {
     /**
      * 开始时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Long startTime;
 
     /**
      * 截止时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Long endTime;
 
     public String getCode() {

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

@@ -3628,6 +3628,12 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
 	private void convertPageInfo(PageInfo info, GoodsFilter goodsFilter) {
+        if (!StringUtils.isEmpty(goodsFilter.getStartTime())) {
+            info.expression(PredicateUtils.gte("createdDate", new java.sql.Date(goodsFilter.getStartTime()), true));
+        }
+        if (!StringUtils.isEmpty(goodsFilter.getEndTime())) {
+            info.expression(PredicateUtils.lte("createdDate", new java.sql.Date(goodsFilter.getEndTime()), true));
+        }
 		if (!StringUtils.isEmpty(goodsFilter.getCode())) {
 			info.filter("code", goodsFilter.getCode());
 		}
@@ -3714,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
@@ -4057,12 +4072,15 @@ public class GoodsServiceImpl implements GoodsService {
             startDate = new java.sql.Date(filter.getStartTime());
         }
         java.sql.Date endDate;
+        // 截止时间+1天
         if (null == filter.getEndTime()) {
             endDate = new java.sql.Date(System.currentTimeMillis());
         } else {
             endDate = new java.sql.Date(filter.getEndTime());
         }
-        StringBuffer sql = new StringBuffer("select br_name_en as brand, count(1) as count from product$brand where br_createtime >= ? and br_createtime <= ? group by br_name_en");
+        Integer addend = 60 * 60 * 24 * 1000;
+        endDate = new java.sql.Date(endDate.getTime() + addend);
+        StringBuffer sql = new StringBuffer("select br_name_en as brand, count(1) as count from product$brand where br_createtime >= ? and br_createtime < ? group by br_name_en");
         StringBuffer countSql = new StringBuffer("select count(1) from (").append(sql).append(") as a");
         Integer count = commonDao.queryForObject(countSql.toString(), Integer.class, startDate, endDate);
         // 分页参数

src/main/java/com/uas/platform/b2c/trade/seek/utils/DateUtils.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2c.trade.seek.utils;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -25,8 +24,8 @@ public class DateUtils {
      * @param day
      * @return
      */
-    public static Date addTime(Date date, Integer day, Integer hour, Integer minute, Integer second){
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+    public static Date addTime(Date date, Integer day, Integer hour, Integer minute, Integer second) {
         return new Date(date.getTime() + day * 24 * 60 * 60 * 1000 + hour * 60 * 60 * 1000 + minute * 60 * 1000 + second * 1000);
     }
+
 }