处理意见反馈

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/CategoryDTO.java

@@ -79,4 +79,10 @@ public class CategoryDTO implements Serializable {
      * 商家ID
      */
     private Long merchantId;
+
+
+    /**
+     * 针对商家分类id，该分类来源于平台得分类
+     */
+    private Long sourceId;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CategoryModifyParam.java

@@ -69,4 +69,8 @@ public class CategoryModifyParam implements Serializable {
      * 商家ID
      */
     private Long merchantId;
+    /**
+     * 针对商家分类id，该分类来源于平台得分类
+     */
+    private Long sourceId;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/Category.java

@@ -69,4 +69,9 @@ public class Category extends ModifyEntity<Long> {
      * 商家ID
      */
     private Long merchantId;
+
+    /**
+     * 针对商家分类id，该分类来源于平台得分类
+     */
+    private Long sourceId;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -45,8 +45,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     public Long addCategory(@NonNull CategoryModifyParam param) {
-        Integer count = this.lambdaQuery().eq(Category::getName, param.getName()).count();
-        AssertUtils.available(count <= 0, "分类名称已存在");
+//        Integer count = this.lambdaQuery().eq(Category::getName, param.getName()).count();
+//        AssertUtils.available(count <= 0, "分类名称已存在");
         Category category = CategoryCopier.INSTANCE.copying(param);
         Long userId = SessionContextHolder.getId();
         Scope scope = StringUtils.ifEmpty(SessionContextHolder.getScope(), Scope::parse);
@@ -175,8 +175,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
             List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
             if (ObjectUtils.isEmpty(merchants)) {
                 return null;
+            }if ("1".equals(param.getType())){
+                param.setMerchantId(merchants.get(0));
             }
-            param.setMerchantId(merchants.get(0));
         }
         List<Category> categories = this.lambdaQuery()
                 .eq(Category::getEnabled, true)