From e49ded0d2b71198f0141389f987e0eb2f179ff4a Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 10 Aug 2020 09:33:09 +0800
Subject: [PATCH] =?UTF-8?q?#I1QA83=20=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=95=86=E5=93=81=E7=A6=81=E6=AD=A2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStoreProductServiceImpl.java        | 10 +++++++++-
 .../template/rest/ShippingTemplatesController.java     | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index 0e5b0272..b4f27a47 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -21,6 +21,7 @@ import co.yixiang.common.utils.QueryHelpPlus;
 import co.yixiang.constant.ShopConstants;
 import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.enums.*;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.modules.category.service.YxStoreCategoryService;
 import co.yixiang.modules.product.domain.YxStoreProduct;
@@ -34,6 +35,7 @@ import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo;
 import co.yixiang.modules.product.vo.YxStoreProductQueryVo;
 import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo;
 import co.yixiang.modules.shop.service.YxSystemStoreService;
+import co.yixiang.modules.template.domain.YxShippingTemplates;
 import co.yixiang.modules.template.service.YxShippingTemplatesService;
 import co.yixiang.modules.user.service.YxUserService;
 import co.yixiang.utils.FileUtil;
@@ -275,7 +277,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
                 || Integer.valueOf(storeFreePostage) == 0){
             tempName = "全国包邮";
         }else{
-            tempName = shippingTemplatesService.getById(storeProduct.getTempId()).getName();
+            YxShippingTemplates shippingTemplates = shippingTemplatesService.getById(storeProduct.getTempId());
+            if(ObjectUtil.isNotNull(shippingTemplates)){
+                tempName = shippingTemplates.getName();
+            }else {
+                throw new BadRequestException("请配置运费模板");
+            }
+
         }
         productVo.setTempName(tempName);
 
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java
index f68d0b19..b6a3a3f3 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java
@@ -11,7 +11,10 @@ import java.util.Arrays;
 
 import co.yixiang.constant.ShopConstants;
 import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.modules.aop.ForbidSubmit;
+import co.yixiang.modules.product.domain.YxStoreProduct;
+import co.yixiang.modules.product.service.YxStoreProductService;
 import co.yixiang.modules.template.domain.YxShippingTemplates;
 import co.yixiang.modules.template.domain.YxSystemCity;
 import co.yixiang.modules.template.service.YxShippingTemplatesService;
@@ -47,6 +50,7 @@ public class ShippingTemplatesController {
     private final YxShippingTemplatesService yxShippingTemplatesService;
     private final YxSystemCityService yxSystemCityService;
     private final IGenerator generator;
+    private final YxStoreProductService yxStoreProductService;
 
 
     @Log("导出数据")
@@ -83,7 +87,13 @@ public class ShippingTemplatesController {
     @PreAuthorize("@el.check('admin','yxShippingTemplates:del')")
     @DeleteMapping
     public ResponseEntity<Object> deleteAll(@RequestBody Integer[] ids) {
+        List<YxStoreProduct> productList = yxStoreProductService.list();
         Arrays.asList(ids).forEach(id->{
+            for (YxStoreProduct yxStoreProduct : productList) {
+                if(id==yxStoreProduct.getTempId()){
+                    throw new BadRequestException("运费模板存在商品关联，请删除对应商品");
+                }
+            }
             yxShippingTemplatesService.removeById(id);
         });
         return new ResponseEntity<>(HttpStatus.OK);