From eeae0cf8d349cf11c84a2c9ed956741b9a3cddb0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 11 十月 2020 18:22:33 +0800
Subject: [PATCH] 优化代码

---
 service-goods/src/main/java/com/java110/goods/api/ProductApi.java |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/service-goods/src/main/java/com/java110/goods/api/ProductApi.java b/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
index dd78cba..7c28913 100644
--- a/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
+++ b/service-goods/src/main/java/com/java110/goods/api/ProductApi.java
@@ -120,11 +120,34 @@
         Assert.hasKeyAndValue(reqJson, "unitName", "璇锋眰鎶ユ枃涓湭鍖呭惈unitName");
         Assert.hasKeyAndValue(reqJson, "sort", "璇锋眰鎶ユ枃涓湭鍖呭惈sort");
         Assert.hasKeyAndValue(reqJson, "isPostage", "璇锋眰鎶ユ枃涓湭鍖呭惈isPostage");
+        Assert.hasKeyAndValue(reqJson, "coverPhoto", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗗搧灏侀潰");
 
+        Assert.hasKey(reqJson,"carouselFigurePhoto","璇锋眰鎶ユ枃涓湭鍖呭惈杞挱鍥�");
+        Assert.hasKey(reqJson,"productSpecs","璇锋眰鎶ユ枃涓湭鍖呭惈瑙勬牸淇℃伅");
+
+
+        String coverPhoto = reqJson.getString("coverPhoto");
+        JSONArray carouselFigurePhoto = reqJson.getJSONArray("carouselFigurePhoto");
+
+        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");
+
+        if(carouselFigurePhoto.size() < 1){
+            throw new IllegalArgumentException("璇锋眰鎶ユ枃涓湭鍖呭惈杞挱鍥�");
+        }
+        if(productSpecs.size() < 1){
+            throw new IllegalArgumentException("璇锋眰鎶ユ枃涓湭鍖呭惈瑙勬牸淇℃伅");
+        }
+
+        JSONObject spec = null;
+        List<ProductSpecValuePo> productSpecValuePos = new ArrayList<>();
+        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
+            spec = productSpecs.getJSONObject(specIndex);
+            productSpecValuePos.add(BeanConvertUtil.covertBean(spec,ProductSpecValuePo.class));
+        }
 
         ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
         productPo.setStoreId(storeId);
-        return saveProductBMOImpl.save(productPo);
+        return saveProductBMOImpl.save(productPo,coverPhoto,carouselFigurePhoto,productSpecValuePos);
     }
 
     /**
@@ -212,24 +235,24 @@
 
         JSONArray specDetails = reqJson.getJSONArray("specDetails");
 
-        if(specDetails.size() < 1){
+        if (specDetails.size() < 1) {
             throw new IllegalArgumentException("鏈寘鍚鏍间俊鎭�");
         }
         ProductSpecDetailPo productSpecDetailPo = null;
         JSONObject specDetail = null;
         List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
-        for(int detailIndex = 0 ; detailIndex < specDetails.size(); detailIndex ++){
+        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
             specDetail = specDetails.getJSONObject(detailIndex);
-            Assert.hasKeyAndValue(specDetail,"detailName","鏈寘鍚鏍�");
-            Assert.hasKeyAndValue(specDetail,"detailValue","鏈寘鍚鏍煎��");
-            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail,ProductSpecDetailPo.class);
+            Assert.hasKeyAndValue(specDetail, "detailName", "鏈寘鍚鏍�");
+            Assert.hasKeyAndValue(specDetail, "detailValue", "鏈寘鍚鏍煎��");
+            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
             productSpecDetailPos.add(productSpecDetailPo);
         }
 
 
         ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
         productSpecPo.setStoreId(storeId);
-        return saveProductSpecBMOImpl.save(productSpecPo,productSpecDetailPos);
+        return saveProductSpecBMOImpl.save(productSpecPo, productSpecDetailPos);
     }
 
     /**
@@ -254,23 +277,23 @@
 
         JSONArray specDetails = reqJson.getJSONArray("specDetails");
 
-        if(specDetails.size() < 1){
+        if (specDetails.size() < 1) {
             throw new IllegalArgumentException("鏈寘鍚鏍间俊鎭�");
         }
         ProductSpecDetailPo productSpecDetailPo = null;
         JSONObject specDetail = null;
         List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
-        for(int detailIndex = 0 ; detailIndex < specDetails.size(); detailIndex ++){
+        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
             specDetail = specDetails.getJSONObject(detailIndex);
-            Assert.hasKeyAndValue(specDetail,"detailName","鏈寘鍚鏍�");
-            Assert.hasKeyAndValue(specDetail,"detailValue","鏈寘鍚鏍煎��");
-            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail,ProductSpecDetailPo.class);
+            Assert.hasKeyAndValue(specDetail, "detailName", "鏈寘鍚鏍�");
+            Assert.hasKeyAndValue(specDetail, "detailValue", "鏈寘鍚鏍煎��");
+            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
             productSpecDetailPos.add(productSpecDetailPo);
         }
 
         ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
         productSpecPo.setStoreId(storeId);
-        return updateProductSpecBMOImpl.update(productSpecPo,productSpecDetailPos);
+        return updateProductSpecBMOImpl.update(productSpecPo, productSpecDetailPos);
     }
 
     /**

--
Gitblit v1.8.0