diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
similarity index 79%
rename from cash-api/product-server/src/main/java/com/czg/controller/ProductController.java
rename to cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
index d0e64c26..bb4cd059 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/ProductController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
@@ -1,4 +1,4 @@
-package com.czg.controller;
+package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
 import com.czg.product.dto.ProductDTO;
@@ -80,23 +80,4 @@ public class ProductController {
         return CzgResult.success();
     }
 
-    @PostMapping("disable/{id}")
-    @OperationLog("商品-禁用")
-    //@SaAdminCheckPermission("product:able")
-    public CzgResult<Void> disableProduct(@PathVariable("id") Long id) {
-        //效验数据
-        AssertUtil.isNull(id, "{}不能为空", "id");
-        productService.disableProduct(id);
-        return CzgResult.success();
-    }
-
-    @PostMapping("enable/{id}")
-    @OperationLog("商品-启用")
-    //@SaAdminCheckPermission("product:able")
-    public CzgResult<Void> enableProduct(@PathVariable("id") Long id) {
-        //效验数据
-        AssertUtil.isNull(id, "{}不能为空", "id");
-        productService.enableProduct(id);
-        return CzgResult.success();
-    }
 }
\ No newline at end of file
diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdCategoryController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java
similarity index 99%
rename from cash-api/product-server/src/main/java/com/czg/controller/ShopProdCategoryController.java
rename to cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java
index 9f107649..2c9a1e1c 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdCategoryController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdCategoryController.java
@@ -1,4 +1,4 @@
-package com.czg.controller;
+package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
 import com.czg.product.dto.ShopProdCategoryDTO;
diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdSpecController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java
similarity index 98%
rename from cash-api/product-server/src/main/java/com/czg/controller/ShopProdSpecController.java
rename to cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java
index dabebf9f..daf018b6 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdSpecController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdSpecController.java
@@ -1,4 +1,4 @@
-package com.czg.controller;
+package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
 import com.czg.product.dto.ShopProdSpecDTO;
diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java
similarity index 99%
rename from cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java
rename to cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java
index f3b97411..6dc647ea 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ShopProdUnitController.java
@@ -1,4 +1,4 @@
-package com.czg.controller;
+package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
 import com.czg.product.dto.ShopProdUnitDTO;
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdSku.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdSku.java
index 4fba3f16..cd22b85a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdSku.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdSku.java
@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 
 import java.io.Serial;
@@ -28,7 +27,7 @@ public class ProdSku implements Serializable {
 	/**
 	* id
 	*/
-	@Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId)
+	@Id(keyType = KeyType.Auto)
 	private Long id;
 	/**
 	* 店铺id
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
index 0a63cf5d..ee7795fc 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 
 import java.io.Serial;
@@ -29,7 +28,7 @@ public class Product implements Serializable {
 	/**
 	* id
 	*/
-	@Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId)
+	@Id(keyType = KeyType.Auto)
 	private Long id;
 	/**
 	* 商品分类
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java
index e8fe2a04..ecd25265 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java
@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 
 import java.io.Serial;
@@ -27,7 +26,7 @@ public class ShopProdCategory implements Serializable {
 	/**
 	* id
 	*/
-	@Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId)
+	@Id(keyType = KeyType.Auto)
 	private Long id;
 	/**
 	* 分类名称
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdSpec.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdSpec.java
index 62c2e91b..353ddeda 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdSpec.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdSpec.java
@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 
 import java.io.Serial;
@@ -27,7 +26,7 @@ public class ShopProdSpec implements Serializable {
 	/**
 	* id
 	*/
-	@Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId)
+	@Id(keyType = KeyType.Auto)
 	private Long id;
 	/**
 	* 规格名称
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java
index 5e20e37b..0dec8e2f 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java
@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 
 import java.io.Serial;
@@ -27,7 +26,7 @@ public class ShopProdUnit implements Serializable {
     /**
      * id
      */
-    @Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId)
+    @Id(keyType = KeyType.Auto)
     private Long id;
     /**
      * 单位名称
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
index 94d1d5d1..b523f345 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java
@@ -26,8 +26,4 @@ public interface ProductService extends IService<Product> {
 
     boolean updateProduct(ProductDTO dto);
 
-    boolean disableProduct(Long id);
-
-    boolean enableProduct(Long id);
-
 }
\ No newline at end of file
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
index bfd8700b..5fa34ae5 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
@@ -147,25 +147,9 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     @Override
     public boolean deleteProduct(Long id) {
-        Long shopId = StpKit.USER.getLoginIdAsLong();
-        return super.remove(query().eq(Product::getId, id).eq(Product::getShopId, shopId));
-    }
-
-    @Override
-    public boolean disableProduct(Long id) {
         Long shopId = StpKit.USER.getLoginIdAsLong();
         return UpdateChain.of(Product.class)
-                //.set(Product::getStatus, StatusEnum.DISABLE.value())
-                .eq(Product::getId, id)
-                .eq(Product::getShopId, shopId)
-                .update();
-    }
-
-    @Override
-    public boolean enableProduct(Long id) {
-        Long shopId = StpKit.USER.getLoginIdAsLong();
-        return UpdateChain.of(Product.class)
-                //.set(Product::getStatus, StatusEnum.ENABLED.value())
+                .set(Product::getIsDel, DeleteEnum.DELETED.value())
                 .eq(Product::getId, id)
                 .eq(Product::getShopId, shopId)
                 .update();