Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/prod/store/api/CommodityController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.prod.store.api;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
@@ -10,18 +11,16 @@ import com.uas.platform.b2c.prod.product.kind.model.KindInfo;
 import com.uas.platform.b2c.prod.store.facade.CommodityFacade;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -60,6 +59,25 @@ public class CommodityController {
 		return goodsService.findGoodsByBatchCode(batchCode);
 	}
 
+	/**
+	 * 根据批次号数组查看产品详情
+	 *
+	 * @param batchCodeList		商品批次号
+	 */
+	@RequestMapping(value = "/detail", method = RequestMethod.POST)
+	public List<Goods> findByBatchCodeList(@RequestBody String batchCodeList) {
+		logger.info(String.format("Find GoodsList by batchCodeList "));
+		List<String> batchCodes = JSON.parseArray(batchCodeList,String.class);
+		List<Goods> goodsList = new ArrayList<>();
+		if (!CollectionUtils.isEmpty(batchCodes)) {
+			for (String batch : batchCodes) {
+				Goods g = goodsService.findGoodsByBatchCode(batch);
+				goodsList.add(g);
+			}
+		}
+		return goodsList;
+	}
+
 	/**
 	 * 根据器件UUID获取器件信息
 	 *