From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java |   48 ++++++++++++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java b/service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java
old mode 100644
new mode 100755
index b0dfbda..db58d71
--- a/service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java
+++ b/service-goods/src/main/java/com/java110/goods/bmo/product/impl/UpdateProductBMOImpl.java
@@ -7,11 +7,11 @@
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.productDetail.ProductDetailDto;
 import com.java110.goods.bmo.product.IUpdateProductBMO;
-import com.java110.intf.IProductDetailInnerServiceSMO;
-import com.java110.intf.IProductSpecValueInnerServiceSMO;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.goods.IProductDetailInnerServiceSMO;
 import com.java110.intf.goods.IProductInnerServiceSMO;
+import com.java110.intf.goods.IProductSpecValueInnerServiceSMO;
 import com.java110.po.file.FileRelPo;
 import com.java110.po.product.ProductPo;
 import com.java110.po.productDetail.ProductDetailPo;
@@ -51,27 +51,40 @@
         int flag = productInnerServiceSMOImpl.updateProduct(productPo);
 
 //淇濆瓨鍟嗗搧灏侀潰
+        //鍒犻櫎 鍥剧墖
+        FileRelPo fileRelPo = new FileRelPo();
+        fileRelPo.setObjId(productPo.getProductId());
+        fileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_COVER);
+        fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
         doSavaRentingFile(coverPhoto, productPo, FileRelDto.REL_TYPE_CD_GOODS_COVER);
 
         if (carouselFigurePhoto != null) {
+            fileRelPo = new FileRelPo();
+            fileRelPo.setObjId(productPo.getProductId());
+            fileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
+            fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
             for (int carouselIndex = 0; carouselIndex < carouselFigurePhoto.size(); carouselIndex++) {
                 doSavaRentingFile(carouselFigurePhoto.getString(carouselIndex), productPo, FileRelDto.REL_TYPE_CD_GOODS_CAROUSEL_FIGURE);
             }
         }
         if (productSpecValuePos != null) {
             //鍒犻櫎鎵�鏈� 瑙勬牸
-            ProductSpecValuePo deleteProductSpecValuePo = new ProductSpecValuePo();
-            deleteProductSpecValuePo.setStoreId(productPo.getStoreId());
-            deleteProductSpecValuePo.setProductId(productPo.getProductId());
-            productSpecValueInnerServiceSMOImpl.deleteProductSpecValue(deleteProductSpecValuePo);
+//            ProductSpecValuePo deleteProductSpecValuePo = new ProductSpecValuePo();
+//            deleteProductSpecValuePo.setStoreId(productPo.getStoreId());
+//            deleteProductSpecValuePo.setProductId(productPo.getProductId());
+//            productSpecValueInnerServiceSMOImpl.deleteProductSpecValue(deleteProductSpecValuePo);
             for (ProductSpecValuePo productSpecValuePo : productSpecValuePos) {
-                productSpecValuePo.setStoreId(productPo.getStoreId());
-                productSpecValuePo.setProductId(productPo.getProductId());
-                productSpecValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
-                flag = productSpecValueInnerServiceSMOImpl.saveProductSpecValue(productSpecValuePo);
-
-                if (flag < 1) {
-                    throw new IllegalArgumentException("淇濆瓨瑙勬牸澶辫触");
+                if (StringUtil.isEmpty(productSpecValuePo.getValueId())
+                        || productSpecValuePo.getValueId().startsWith("-")) {
+                    productSpecValuePo.setStoreId(productPo.getStoreId());
+                    productSpecValuePo.setProductId(productPo.getProductId());
+                    productSpecValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+                    flag = productSpecValueInnerServiceSMOImpl.saveProductSpecValue(productSpecValuePo);
+                    if (flag < 1) {
+                        throw new IllegalArgumentException("淇濆瓨瑙勬牸澶辫触");
+                    }
+                } else {
+                    productSpecValueInnerServiceSMOImpl.updateProductSpecValue(productSpecValuePo);
                 }
             }
         }
@@ -88,7 +101,7 @@
             productDetailPo.setProductId(productPo.getProductId());
             productDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
             flag = productDetailInnerServiceSMOImpl.saveProductDetail(productDetailPo);
-        }else{
+        } else {
             productDetailPo.setProductId(productPo.getProductId());
             flag = productDetailInnerServiceSMOImpl.updateProductDetail(productDetailPo);
 
@@ -114,11 +127,6 @@
             return;
         }
 
-        //鍒犻櫎 鍥剧墖
-        FileRelPo fileRelPo = new FileRelPo();
-        fileRelPo.setObjId(productPo.getProductId());
-        fileRelPo.setRelTypeCd(fileTypeCd);
-        fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
 
         FileDto fileDto = new FileDto();
         fileDto.setCommunityId("-1");
@@ -128,7 +136,7 @@
 
         fileDto.setSuffix("jpeg");
         String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-
+        FileRelPo fileRelPo = null;
         fileRelPo = new FileRelPo();
         fileRelPo.setObjId(productPo.getProductId());
         fileRelPo.setRelTypeCd(fileTypeCd);

--
Gitblit v1.8.0