Merge remote-tracking branch 'origin/public-mater20180118' into public-mater20180118

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

@@ -838,6 +838,7 @@ public class ProductServiceImpl implements ProductService {
             productPrivate.setBatchCount(0);
             productPrivateDao.save(productPrivate);
         }
+        // TODO 调用公有域接口
         productDao.save(afterProduct);
         updateInfoAfterTurnStandard(matchId, standardProduct);
         return ResultMap.success(null);
@@ -869,6 +870,7 @@ public class ProductServiceImpl implements ProductService {
             return new ResultMap(CodeType.NO_INFO, "匹配结果信息丢失");
         }
         Product standardProduct = updateProductAfterMatch(beforeProduct, result);
+        // TODO 调用公有域保存方法
         productDao.save(standardProduct);
 
         Product afterProduct = productDao.findOne(afterId);
@@ -937,7 +939,6 @@ public class ProductServiceImpl implements ProductService {
         Integer count = productPrivate.getBatchCount();
         productPrivate.setBatchCount(count + saveList.size());
         productPrivateDao.save(productPrivate);
-        productDao.save(product);
         goodsHistoryDao.save(historyList);
     }
 
@@ -1157,6 +1158,7 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public Product save(Product product) {
+        // TODO 调用公有域保存方法
         return productDao.save(product);
     }
 
@@ -1168,6 +1170,7 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public List<Product> save(List<Product> products) {
+        // TODO 调用公有域保存方法
         return productDao.save(products);
     }
 

src/main/java/com/uas/platform/b2c/prod/product/component/api/ComponentController.java

@@ -167,6 +167,17 @@ public class ComponentController {
 		return componentService.findByCode(code);
 	}
 
+	/**
+	 * 根据code查找ComponentInfo
+	 *
+	 * @param code
+	 * @return 器件简易信息
+	 */
+	@RequestMapping(value = "/byCode", method = RequestMethod.GET)
+	public List<ComponentInfo> findComponentByCode(String code) {
+		return componentService.findEqualCode(code);
+	}
+
 	/**
 	 * 根据uuid查找Component
 	 * 

src/main/java/com/uas/platform/b2c/prod/product/component/service/ComponentService.java

@@ -64,6 +64,14 @@ public interface ComponentService {
 	 */
 	public List<ComponentInfo> findByCode(String code);
 
+	/**
+	 * 根据原厂型号查找有效器件
+	 *
+	 * @param code 原厂型号
+	 * @return 器件信息
+	 */
+	List<ComponentInfo> findEqualCode(String code);
+
 	/**
 	 * 根据原厂型号数组查找有效器件列表
 	 * 

src/main/java/com/uas/platform/b2c/prod/product/component/service/impl/ComponentServiceImpl.java

@@ -126,6 +126,11 @@ public class ComponentServiceImpl implements ComponentService {
 		return componentInfoDao.findByLikeCode("%" + code + "%");
 	}
 
+	@Override
+	public List<ComponentInfo> findEqualCode(String code) {
+		return componentInfoDao.findByCode(code);
+	}
+
 	@Override
 	public List<ComponentInfo> findByCodes(String[] codes) {
 		// 限制每次查找的器件个数