From 8873be7def574a9b7a3edbe9f12f38dd994f67cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com>
Date: Thu, 25 May 2023 16:49:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../express/impl/ShippingTemplatesServiceImpl.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
index 5c60bfe65..2a0984795 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
@@ -96,6 +96,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
         shippingTemplatesDO.setSort(request.getSort());
         shippingTemplatesDO.setType(request.getType());
         shippingTemplatesDO.setDeleted(false);
+        shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
         shippingTemplatesDO.setAppoint(request.getAppoint());
 
         save(shippingTemplatesDO);
@@ -110,7 +111,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
         }
 
         ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS();
-        if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO)){
+        if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO) && request.getNoDelivery()){
             shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
         }
 
@@ -140,7 +141,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
     }
 
     /**
-     * 新增
+     * 修改
      * @param id Integer 模板id
      * @param request ShippingTemplatesRequest 新增参数
      */
@@ -152,6 +153,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
         shippingTemplatesDO.setSort(request.getSort());
         shippingTemplatesDO.setType(request.getType());
         shippingTemplatesDO.setAppoint(request.getAppoint());
+        shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
 
 
         updateById(shippingTemplatesDO);
@@ -166,7 +168,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
 
         List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList();
         if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){
-            shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId());
+            shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), id);
         }
         ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS();
         if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){