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

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -1572,4 +1572,20 @@ public class Goods implements Serializable {
 		g.setUuid(product.getCmpUuId());
 		return g;
 	}
+
+	/**
+	 * 产品转goods
+	 * @return
+	 */
+	public static Goods productConvertGoods(V_ProductPrivate product) {
+		Goods g = new Goods();
+		g.setProdNum(product.getProdNum());
+		g.setKindNameCn(product.getKind());
+		g.setBrandNameEn(product.getPbranden());
+		g.setCode(product.getPcmpcode());
+		g.setEncapsulation(product.getEncapsulation());
+		g.setPackaging(product.getPackaging());
+		g.setUuid(product.getCmpUuId());
+		return g;
+	}
 }

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

@@ -302,7 +302,7 @@ public class ProductServiceImpl implements ProductService {
         page.setPageNumber(1);
         page.setPageSize(10);
 
-        List<Product> products = new ArrayList<Product>();
+        List<V_ProductPrivate> products = new ArrayList<>();
         page.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
         page.filter("b2cEnabled", com.uas.platform.b2c.prod.commodity.constant.IntegerConstant.YES_INT);
         page.sorting(Sort.Direction.DESC, "standard", "id");
@@ -323,15 +323,15 @@ public class ProductServiceImpl implements ProductService {
 //            LogicalExpression logicalExpression2 = PredicateUtils.or(expressions2);
 //            page.expression(logicalExpression2);
 //        }
-        products = productDao.findAll(new Specification<Product>() {
+        products = v_productPrivateDao.findAll(new Specification<V_ProductPrivate>() {
             @Override
-            public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+            public Predicate toPredicate(Root<V_ProductPrivate> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
             query.where(page.getPredicates(root, query, cb));
             return null;
             }
         }, page.getSort());
         List<Goods> goodses = new ArrayList<>();
-        for (Product product : products) {
+        for (V_ProductPrivate product : products) {
             List<Goods> goodses1 = goodsDao.findByProductIdOrderByGoodsId(product.getId());
             if (goodses1.size() > 0) {
                 goodses.addAll(goodses1);
@@ -840,8 +840,7 @@ public class ProductServiceImpl implements ProductService {
             productPrivate.setBatchCount(0);
             productPrivateDao.save(productPrivate);
         }
-        // TODO 调用公有域接口
-        productDao.save(afterProduct);
+        restTemplate.postForEntity("http://192.168.253.129:8099/product/update", afterProduct, String.class);
         updateInfoAfterTurnStandard(matchId, standardProduct);
         return ResultMap.success(null);
     }
@@ -872,8 +871,7 @@ public class ProductServiceImpl implements ProductService {
             return new ResultMap(CodeType.NO_INFO, "匹配结果信息丢失");
         }
         Product standardProduct = updateProductAfterMatch(beforeProduct, result);
-        // TODO 调用公有域保存方法
-        productDao.save(standardProduct);
+        restTemplate.postForEntity("http://192.168.253.129:8099/product/update", standardProduct, String.class);
 
         Product afterProduct = productDao.findOne(afterId);
         updateInfoAfterTurnStandard(beforeId, afterProduct);