From 23deb53971f812fb99aeb495cefb9670f6a6844b Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Mon, 14 Jul 2025 11:28:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ShopBaseProductCategoryController.java | 14 +++++++++++++- sql/shop/dev/20250714_ddl.sql | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 sql/shop/dev/20250714_ddl.sql diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryController.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryController.java index c540a3cc..cab50e47 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/controller/admin/ShopBaseProductCategoryController.java @@ -1,6 +1,6 @@ package com.suisung.mall.shop.base.controller.admin; -import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.base.ShopBaseProductCategory; @@ -107,6 +107,18 @@ public class ShopBaseProductCategoryController { return CommonResult.failed("商品分类不存在"); } oldShopBaseProductCategory.setStore_id(oldShopBaseProductCategory.getStore_id()); + if(ObjectUtil.equals(oldShopBaseProductCategory.getType_id(), 0)){ + oldShopBaseProductCategory.setCategory_name(shopBaseProductCategory.getCategory_name()); + oldShopBaseProductCategory.setCategory_image(shopBaseProductCategory.getCategory_image()); + oldShopBaseProductCategory.setType_id(shopBaseProductCategory.getType_id()); + oldShopBaseProductCategory.setCategory_virtual_enable(shopBaseProductCategory.getCategory_virtual_enable()); + oldShopBaseProductCategory.setCategory_commission_rate(shopBaseProductCategory.getCategory_commission_rate()); + oldShopBaseProductCategory.setPage_id(shopBaseProductCategory.getPage_id()); + oldShopBaseProductCategory.setCategory_order(shopBaseProductCategory.getCategory_order()); + }else { + oldShopBaseProductCategory.setCategory_order(shopBaseProductCategory.getCategory_order()); + } + return CommonResult.success(shopBaseProductCategoryService.editCategory(oldShopBaseProductCategory)); } return CommonResult.success(shopBaseProductCategoryService.editCategory(shopBaseProductCategory)); diff --git a/sql/shop/dev/20250714_ddl.sql b/sql/shop/dev/20250714_ddl.sql new file mode 100644 index 00000000..abcbaa07 --- /dev/null +++ b/sql/shop/dev/20250714_ddl.sql @@ -0,0 +1 @@ +alter table shop_base_product_category modify `type_id` mediumint unsigned NOT NULL DEFAULT '0' COMMENT '商品类型编号'; \ No newline at end of file