优化

mp-service/src/main/java/com/qs/mp/common/domain/ShippingTemplate.java

@@ -37,6 +37,12 @@ public class ShippingTemplate implements Serializable {
     @TableField("title")
     private String title;
 
+
+    @ApiModelProperty("默认模板 0不默认,1默认")
+    @TableField("is_default")
+    private Integer isDefault;
+
+
     /**
      * 创建时间
      */

mp-service/src/main/java/com/qs/mp/common/service/impl/ShippingTemplateServiceImpl.java

@@ -52,6 +52,9 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
         if (Objects.isNull(shippingTemplate)) {
             throw new ServiceException("运费模板不存在");
         }
+        if (shippingTemplate.getIsDefault() == 1) {
+            throw new ServiceException("默认模板不能删除");
+        }
 
         // 清除原来运费模板规则地区
         List<ShippingTemplateRule> shippingTemplateRules = shippingTemplateRuleService.list(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, id));
@@ -114,23 +117,26 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
 
         // 新增运费模板规则
         List<ShippingTemplateRuleParam> shippingTemplateRuleList = shippingTemplateParam.getShippingTemplateRuleList();
-        for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
-            ShippingTemplateRule shippingTemplateRule = new ShippingTemplateRule();
-            BeanUtils.copyProperties(shippingTemplateRuleParam, shippingTemplateRule);
-            shippingTemplateRule.setShippingTemplateId(shippingTemplate.getId());
-            shippingTemplateRuleService.save(shippingTemplateRule);
-
-            // 新增运费模板规则地区
-            List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
-            List<ShippingTemplateRuleArea> params = new ArrayList<>();
-            for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
-                ShippingTemplateRuleArea param = new ShippingTemplateRuleArea();
-                BeanUtils.copyProperties(shippingTemplateRuleAreaParam, param);
-                param.setShippingTemplateRuleId(shippingTemplateRule.getId());
-                params.add(param);
+        if (!CollectionUtils.isEmpty(shippingTemplateRuleList)) {
+            for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
+                ShippingTemplateRule shippingTemplateRule = new ShippingTemplateRule();
+                BeanUtils.copyProperties(shippingTemplateRuleParam, shippingTemplateRule);
+                shippingTemplateRule.setShippingTemplateId(shippingTemplate.getId());
+                shippingTemplateRuleService.save(shippingTemplateRule);
+
+                // 新增运费模板规则地区
+                List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
+                List<ShippingTemplateRuleArea> params = new ArrayList<>();
+                for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
+                    ShippingTemplateRuleArea param = new ShippingTemplateRuleArea();
+                    BeanUtils.copyProperties(shippingTemplateRuleAreaParam, param);
+                    param.setShippingTemplateRuleId(shippingTemplateRule.getId());
+                    params.add(param);
+                }
+                shippingTemplateRuleAreaService.saveBatch(params);
             }
-            shippingTemplateRuleAreaService.saveBatch(params);
         }
+
         return true;
     }
 
@@ -149,11 +155,13 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
 
         // 清除原来运费模板规则地区
         List<ShippingTemplateRule> shippingTemplateRules = shippingTemplateRuleService.list(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, shippingTemplateId));
-        for (ShippingTemplateRule shippingTemplateRule : shippingTemplateRules) {
-            shippingTemplateRuleAreaService.remove(new LambdaQueryWrapper<ShippingTemplateRuleArea>().eq(ShippingTemplateRuleArea::getShippingTemplateRuleId, shippingTemplateRule.getId()));
+        if (!CollectionUtils.isEmpty(shippingTemplateRules)) {
+            for (ShippingTemplateRule shippingTemplateRule : shippingTemplateRules) {
+                shippingTemplateRuleAreaService.remove(new LambdaQueryWrapper<ShippingTemplateRuleArea>().eq(ShippingTemplateRuleArea::getShippingTemplateRuleId, shippingTemplateRule.getId()));
+            }
+            // 清除原来的运费模板规则
+            shippingTemplateRuleService.remove(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, shippingTemplateId));
         }
-        // 清除原来的运费模板规则
-        shippingTemplateRuleService.remove(new LambdaQueryWrapper<ShippingTemplateRule>().eq(ShippingTemplateRule::getShippingTemplateId, shippingTemplateId));
 
         // 更新运费模板
         ShippingTemplate shippingTemplate = new ShippingTemplate();
@@ -162,22 +170,24 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
 
         // 新增运费模板规则
         List<ShippingTemplateRuleParam> shippingTemplateRuleList = shippingTemplateParam.getShippingTemplateRuleList();
-        for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
-            ShippingTemplateRule shippingTemplateRule = new ShippingTemplateRule();
-            BeanUtils.copyProperties(shippingTemplateRuleParam, shippingTemplateRule);
-            shippingTemplateRule.setShippingTemplateId(shippingTemplateId);
-            shippingTemplateRuleService.save(shippingTemplateRule);
-
-            // 新增运费模板规则地区
-            List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
-            List<ShippingTemplateRuleArea> params = new ArrayList<>();
-            for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
-                ShippingTemplateRuleArea param = new ShippingTemplateRuleArea();
-                BeanUtils.copyProperties(shippingTemplateRuleAreaParam, param);
-                param.setShippingTemplateRuleId(shippingTemplateRule.getId());
-                params.add(param);
+        if (!CollectionUtils.isEmpty(shippingTemplateRuleList)) {
+            for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
+                ShippingTemplateRule shippingTemplateRule = new ShippingTemplateRule();
+                BeanUtils.copyProperties(shippingTemplateRuleParam, shippingTemplateRule);
+                shippingTemplateRule.setShippingTemplateId(shippingTemplateId);
+                shippingTemplateRuleService.save(shippingTemplateRule);
+
+                // 新增运费模板规则地区
+                List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
+                List<ShippingTemplateRuleArea> params = new ArrayList<>();
+                for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
+                    ShippingTemplateRuleArea param = new ShippingTemplateRuleArea();
+                    BeanUtils.copyProperties(shippingTemplateRuleAreaParam, param);
+                    param.setShippingTemplateRuleId(shippingTemplateRule.getId());
+                    params.add(param);
+                }
+                shippingTemplateRuleAreaService.saveBatch(params);
             }
-            shippingTemplateRuleAreaService.saveBatch(params);
         }
 
         return true;
@@ -194,36 +204,35 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
         }
 
         List<ShippingTemplateRuleParam> shippingTemplateRuleList = shippingTemplateParam.getShippingTemplateRuleList();
-        if (CollectionUtils.isEmpty(shippingTemplateRuleList)) {
-            throw new ServiceException("运费模板规则不能为空");
-        }
-
-        for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
-            List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
-            if (CollectionUtils.isEmpty(shippingTemplateRuleAreaList)) {
-                throw new ServiceException("运费模板规则区域不能为空");
-            }
+        if (!CollectionUtils.isEmpty(shippingTemplateRuleList)) {
+            for (ShippingTemplateRuleParam shippingTemplateRuleParam : shippingTemplateRuleList) {
+                List<ShippingTemplateRuleAreaParam> shippingTemplateRuleAreaList = shippingTemplateRuleParam.getShippingTemplateRuleAreaList();
+                if (CollectionUtils.isEmpty(shippingTemplateRuleAreaList)) {
+                    throw new ServiceException("运费模板规则区域不能为空");
+                }
 
-            for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
+                for (ShippingTemplateRuleAreaParam shippingTemplateRuleAreaParam : shippingTemplateRuleAreaList) {
 
-                if (StringUtils.isBlank(shippingTemplateRuleAreaParam.getProvince())) {
-                    throw new ServiceException("省份不能为空");
-                }
+                    if (StringUtils.isBlank(shippingTemplateRuleAreaParam.getProvince())) {
+                        throw new ServiceException("省份不能为空");
+                    }
 
-                if (Objects.isNull(shippingTemplateRuleAreaParam.getProvinceId())) {
-                    throw new ServiceException("省份ID不能为空");
-                }
+                    if (Objects.isNull(shippingTemplateRuleAreaParam.getProvinceId())) {
+                        throw new ServiceException("省份ID不能为空");
+                    }
 
-                if (StringUtils.isBlank(shippingTemplateRuleAreaParam.getCity())) {
-                    throw new ServiceException("城市不能为空");
-                }
+                    if (StringUtils.isBlank(shippingTemplateRuleAreaParam.getCity())) {
+                        throw new ServiceException("城市不能为空");
+                    }
 
-                if (Objects.isNull(shippingTemplateRuleAreaParam.getCityId())) {
-                    throw new ServiceException("城市ID不能为空");
+                    if (Objects.isNull(shippingTemplateRuleAreaParam.getCityId())) {
+                        throw new ServiceException("城市ID不能为空");
+                    }
                 }
             }
         }
 
 
+
     }
 }