From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件

---
 admin/app/shop/model/supplier/Category.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/app/shop/model/supplier/Category.php b/admin/app/shop/model/supplier/Category.php
index 87996a5..c9e873b 100644
--- a/admin/app/shop/model/supplier/Category.php
+++ b/admin/app/shop/model/supplier/Category.php
@@ -24,7 +24,7 @@
     public function add($data)
     {
         $data['app_id'] = self::$app_id;
-        $isExist = static::where('name','=',$data['name'])->find();
+        $isExist = static::where('name','=',$data['name'])->where('category_type','=',$data['category_type'])->find();
         if($isExist){
             $this->error='名称已存在';
             return false;
@@ -37,7 +37,7 @@
      */
     public function edit($data)
     {   
-        $isExist = static::where('name','=',$data['name'])->where('category_id','<>',$data['category_id'])->find();
+        $isExist = static::where('name','=',$data['name'])->where('category_type','=',$data['category_type'])->where('category_id','<>',$data['category_id'])->find();
         if($isExist){
             $this->error='名称已存在';
             return false;

--
Gitblit v1.9.2