Merge remote-tracking branch 'origin/master'

@@ -160,7 +160,7 @@ public class CollectionUtil {
 		});
 		});
 		return r;
 		return r;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 多个条件分组.
 	 * 多个条件分组.
 	 * 
 	 * 
@@ -168,10 +168,10 @@ public class CollectionUtil {
 	 * @param groupKey 多个分组方法
 	 * @param groupKey 多个分组方法
 	 * @return 分组结果
 	 * @return 分组结果
 	 */
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	/*@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T, U> Map groupingByMulti(Collection<U> collection, Function<? super U, ?>... groupKey) {
 	public static <T, U> Map groupingByMulti(Collection<U> collection, Function<? super U, ?>... groupKey) {
 		return groupingByMulti(collection.stream(), groupKey);
 		return groupingByMulti(collection.stream(), groupKey);
-	}
+	}*/
 
 
 	/**
 	/**
 	 * 多个条件分组.
 	 * 多个条件分组.
@@ -180,14 +180,14 @@ public class CollectionUtil {
 	 * @param groupKey 多个分组方法
 	 * @param groupKey 多个分组方法
 	 * @return 分组结果
 	 * @return 分组结果
 	 */
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	/*@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T, U> Map groupingByMulti(Stream<U> stearm, Function<? super U, ?>... groupKey) {
 	public static <T, U> Map groupingByMulti(Stream<U> stearm, Function<? super U, ?>... groupKey) {
 		Collector c = Collectors.groupingBy(groupKey[groupKey.length - 1]);
 		Collector c = Collectors.groupingBy(groupKey[groupKey.length - 1]);
 		for (int i = groupKey.length - 2; i >= 0; i--) {
 		for (int i = groupKey.length - 2; i >= 0; i--) {
 			c = Collectors.groupingBy(groupKey[i], c);
 			c = Collectors.groupingBy(groupKey[i], c);
 		}
 		}
 		return (Map) stearm.collect(c);
 		return (Map) stearm.collect(c);
-	}
+	}*/
 	
 	
 	/**
 	/**
 	 * 多条件排序
 	 * 多条件排序

@@ -175,7 +175,7 @@
   </update>
   </update>
 
 
   <select id="selectProductStorageCount" resultType="java.lang.Integer">
   <select id="selectProductStorageCount" resultType="java.lang.Integer">
-    select count(*) from from product p where <include refid="skcPageCondition" />
+    select count(*) from product p where <include refid="skcPageCondition" />
   </select>
   </select>
 
 
   <select id="selectProductStorageList" resultMap="BaseResultMap">
   <select id="selectProductStorageList" resultMap="BaseResultMap">
@@ -185,6 +185,7 @@
   </select>
   </select>
 
 
   <sql id="skcPageCondition">
   <sql id="skcPageCondition">
+    1 = 1
     <if test="product.id != null and product.id > 0">
     <if test="product.id != null and product.id > 0">
       and p.id = #{product.id}
       and p.id = #{product.id}
     </if>
     </if>

@@ -120,6 +120,7 @@
   </select>
   </select>
 
 
   <sql id="skupPageCondition2" >
   <sql id="skupPageCondition2" >
+    1 = 1
     <if test="storagePrice.status != null and storagePrice.status > -1">
     <if test="storagePrice.status != null and storagePrice.status > -1">
       and status = #{storagePrice.status}
       and status = #{storagePrice.status}
     </if>
     </if>
@@ -141,7 +142,7 @@
     select id, skup, product_id, goods_id, storage_id, depot_num, seller_uid, price, status,
     select id, skup, product_id, goods_id, storage_id, depot_num, seller_uid, price, status,
     update_time, create_time
     update_time, create_time
     from storage_price
     from storage_price
-    where where product_id in
+    where product_id in
     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
     <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
       #{item}
       #{item}
     </foreach> and status = 1
     </foreach> and status = 1

@@ -253,8 +253,8 @@ public class ProductServiceImpl implements IProductService {
 		ProductEditResponceBo bo = new ProductEditResponceBo();
 		ProductEditResponceBo bo = new ProductEditResponceBo();
 		BeanUtils.copyProperties(product, bo);
 		BeanUtils.copyProperties(product, bo);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		bo.setSaleTime(sdf.format((product.getSaleTime() == null || product.getSaleTime() == 0) ? ""
-				: sdf.format(product.getSaleTime() * 1000L)));
+		bo.setSaleTime((product.getSaleTime() == null || product.getSaleTime() == 0) ? ""
+				: sdf.format(product.getSaleTime() * 1000L));
 		bo.setGender(new Integer(product.getGender()));
 		bo.setGender(new Integer(product.getGender()));
 		bo.setMinPrice(product.getMinPrice().toString());
 		bo.setMinPrice(product.getMinPrice().toString());
 		bo.setMaxPrice(product.getMaxPrice().toString());
 		bo.setMaxPrice(product.getMaxPrice().toString());
@@ -385,12 +385,13 @@ public static void main(String[] args) {
 					bo.getSkup(),
 					bo.getSkup(),
 					bo.getStart(),
 					bo.getStart(),
 					bo.getRows());
 					bo.getRows());
+			List<Integer> productIdList = CollectionUtil.distinct(productList, Product::getId);
+			productList = productMapper.selectProductListByIds(productIdList);
 			productList.forEach(p -> {
 			productList.forEach(p -> {
 				ProductResponceBo b = new ProductResponceBo();
 				ProductResponceBo b = new ProductResponceBo();
 				BeanUtils.copyProperties(p, b);
 				BeanUtils.copyProperties(p, b);
 				boList.add(b);
 				boList.add(b);
 			});
 			});
-			List<Integer> productIdList = CollectionUtil.distinct(productList, Product::getId);
 			List<Goods> goodsList = goodsMapper.selectByProductId(productIdList);
 			List<Goods> goodsList = goodsMapper.selectByProductId(productIdList);
 			Map<Integer, Goods> goodsMap = CollectionUtil.extractMap(goodsList, Goods::getProductId);
 			Map<Integer, Goods> goodsMap = CollectionUtil.extractMap(goodsList, Goods::getProductId);
 			List<Brand> brandList = brandMapper.selectBrandByIdList(CollectionUtil.distinct(productList, Product::getBrandId));
 			List<Brand> brandList = brandMapper.selectBrandByIdList(CollectionUtil.distinct(productList, Product::getBrandId));
@@ -463,7 +464,7 @@ public static void main(String[] args) {
 					bo.getStorageId(),
 					bo.getStorageId(),
 					bo.getStart(),
 					bo.getStart(),
 					bo.getRows());
 					bo.getRows());
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			storagePrice.forEach(sp -> {
 			storagePrice.forEach(sp -> {
 				ProductResponceBo b = new ProductResponceBo();
 				ProductResponceBo b = new ProductResponceBo();
 				b.setSkup(sp.getSkup());
 				b.setSkup(sp.getSkup());
@@ -498,6 +499,9 @@ public static void main(String[] args) {
 	
 	
 	@Override
 	@Override
 	public ApiResponse<Void> changeProductStatus(ProductRequestBo bo) {
 	public ApiResponse<Void> changeProductStatus(ProductRequestBo bo) {
+		if (bo.getStatus() == null || (bo.getStatus() != 1 && bo.getStatus() != 0)) {
+			return new ApiResponse<>(400, "上下架状态错误");
+		}
 		Product product = productMapper.selectByPrimaryKey(bo.getId());
 		Product product = productMapper.selectByPrimaryKey(bo.getId());
 		if (product == null) {
 		if (product == null) {
 			return new ApiResponse<>(400, "商品不存在");
 			return new ApiResponse<>(400, "商品不存在");