From c35a67e8ebefc23b9c54a244dbc5cb9ddb339a40 Mon Sep 17 00:00:00 2001
From: OPGame <1242479791@qq.com>
Date: Mon, 12 Aug 2019 10:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CategoryServiceImpl.java     | 12 ++---
 .../shop/service/impl/ProductServiceImpl.java | 20 +++----
 .../service/impl/ShopDetailServiceImpl.java   | 54 +++++++++----------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java
index 203dbb8..5c53934 100644
--- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java
@@ -84,9 +84,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 		deleteBrandsAndAttributes(category.getCategoryId());
 		insertBrandsAndAttributes(category);
 		// 如果以前有图片，并且图片与现在不同，则删除以前的图片
-		if (StrUtil.isNotBlank(dbCategory.getPic()) && !dbCategory.getPic().equals(category.getPic())) {
-			attachFileService.deleteFile(dbCategory.getPic());
-		}
+//		if (StrUtil.isNotBlank(dbCategory.getPic()) && !dbCategory.getPic().equals(category.getPic())) {
+//			attachFileService.deleteFile(dbCategory.getPic());
+//		}
 	}
 	
 	@Override
@@ -96,9 +96,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 		categoryMapper.deleteById(categoryId);
 		
 		deleteBrandsAndAttributes(categoryId);
-		if (StrUtil.isNotBlank(category.getPic())) {
-			attachFileService.deleteFile(category.getPic());
-		}
+//		if (StrUtil.isNotBlank(category.getPic())) {
+//			attachFileService.deleteFile(category.getPic());
+//		}
 	}
 	
 
diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java
index 3c0181a..09bbab4 100644
--- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java
@@ -79,10 +79,10 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         productMapper.updateById(product);
         List<Long> dbSkuIds = dbProduct.getSkuList().stream().map(Sku::getSkuId).collect(Collectors.toList());
         // 2019/04/c0244be79909484fb67bc6d5f70cae18.jpg
-        if (!Objects.equals(dbProduct.getPic(), product.getPic()) && StrUtil.isNotBlank(dbProduct.getPic())) {
-            // 删除数据库中的商品图片
-            attachFileService.deleteFile(dbProduct.getPic());
-        }
+//        if (!Objects.equals(dbProduct.getPic(), product.getPic()) && StrUtil.isNotBlank(dbProduct.getPic())) {
+//            // 删除数据库中的商品图片
+//            attachFileService.deleteFile(dbProduct.getPic());
+//        }
         // 将所有该商品的sku标记为已删除状态
         skuMapper.deleteByProdId(product.getProdId());
 
@@ -141,12 +141,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 .eq(ProdTagReference::getProdId, prodId));
 
         // 删除数据库中的商品图片
-        if (StrUtil.isNotBlank(dbProduct.getImgs())) {
-            String[] imgs = dbProduct.getImgs().split(StrUtil.COMMA);
-            for (String img : imgs) {
-                attachFileService.deleteFile(img);
-            }
-        }
+//        if (StrUtil.isNotBlank(dbProduct.getImgs())) {
+//            String[] imgs = dbProduct.getImgs().split(StrUtil.COMMA);
+//            for (String img : imgs) {
+//                attachFileService.deleteFile(img);
+//            }
+//        }
     }
 
     @Override
diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java
index 081390e..0378a04 100644
--- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java
@@ -46,23 +46,23 @@ public class ShopDetailServiceImpl extends ServiceImpl<ShopDetailMapper, ShopDet
     public void updateShopDetail(ShopDetail shopDetail,ShopDetail dbShopDetail) {
     	// 更新除数据库中的信息，再删除图片
     	shopDetailMapper.updateById(shopDetail);
-    	if (!Objects.equals(dbShopDetail.getShopLogo(), shopDetail.getShopLogo())) {
-    		// 删除logo
-    		attachFileService.deleteFile(shopDetail.getShopLogo());
-    	}
-    	// 店铺图片
-    	String shopPhotos = shopDetail.getShopPhotos();
-    	String[] shopPhotoArray =StrUtil.isBlank(shopPhotos)?new String[]{}: shopPhotos.split(",");
-    	
-    	// 数据库中的店铺图片
-    	String dbShopPhotos = dbShopDetail.getShopPhotos();
-    	String[] dbShopPhotoArray =StrUtil.isBlank(dbShopPhotos)?new String[]{}: dbShopPhotos.split(",");
-    	for (String dbShopPhoto : dbShopPhotoArray) {
-    		// 如果新插入的图片中没有旧数据中的图片，则删除旧数据中的图片
-			if (!ArrayUtil.contains(shopPhotoArray, dbShopPhoto)) {
-				attachFileService.deleteFile(dbShopPhoto);
-			}
-		}
+//    	if (!Objects.equals(dbShopDetail.getShopLogo(), shopDetail.getShopLogo())) {
+//    		// 删除logo
+//    		attachFileService.deleteFile(shopDetail.getShopLogo());
+//    	}
+//    	// 店铺图片
+//    	String shopPhotos = shopDetail.getShopPhotos();
+//    	String[] shopPhotoArray =StrUtil.isBlank(shopPhotos)?new String[]{}: shopPhotos.split(",");
+//
+//    	// 数据库中的店铺图片
+//    	String dbShopPhotos = dbShopDetail.getShopPhotos();
+//    	String[] dbShopPhotoArray =StrUtil.isBlank(dbShopPhotos)?new String[]{}: dbShopPhotos.split(",");
+//    	for (String dbShopPhoto : dbShopPhotoArray) {
+//    		// 如果新插入的图片中没有旧数据中的图片，则删除旧数据中的图片
+//			if (!ArrayUtil.contains(shopPhotoArray, dbShopPhoto)) {
+//				attachFileService.deleteFile(dbShopPhoto);
+//			}
+//		}
     }
     
 	@Override
@@ -72,17 +72,17 @@ public class ShopDetailServiceImpl extends ServiceImpl<ShopDetailMapper, ShopDet
 		// 先删除数据库中的信息，再删除图片
 		shopDetailMapper.deleteById(shopId);
 		
-		ShopDetail shopDetail = shopDetailMapper.selectById(shopId);
+//		ShopDetail shopDetail = shopDetailMapper.selectById(shopId);
 		// 删除logo
-		attachFileService.deleteFile(shopDetail.getShopLogo());
-		// 删除店铺图片
-		String shopPhotos = shopDetail.getShopPhotos();
-		if (StrUtil.isNotBlank(shopPhotos)) {
-			String[] shopPhotoArray = shopPhotos.split(",");
-			for (String shopPhoto : shopPhotoArray) {
-				attachFileService.deleteFile(shopPhoto);
-			}
-		}
+//		attachFileService.deleteFile(shopDetail.getShopLogo());
+//		// 删除店铺图片
+//		String shopPhotos = shopDetail.getShopPhotos();
+//		if (StrUtil.isNotBlank(shopPhotos)) {
+//			String[] shopPhotoArray = shopPhotos.split(",");
+//			for (String shopPhoto : shopPhotoArray) {
+//				attachFileService.deleteFile(shopPhoto);
+//			}
+//		}
 	}
 
 	@Override