From 6521c5a5a42624fe0d2652180ae7e9a654f60b82 Mon Sep 17 00:00:00 2001 From: yuanjunzhe <1374457292@qq.com> Date: Tue, 12 Mar 2024 15:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/product/domain/BrandInfo.java | 8 ++++---- .../muyu/product/service/impl/BrandInfoServiceImpl.java | 4 ++-- .../src/main/resources/mapper/product/BrandInfoMapper.xml | 4 ++-- .../main/resources/mapper/product/CategoryInfoMapper.xml | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java index d94d3af..ce4c9f7 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java @@ -44,7 +44,7 @@ public class BrandInfo extends BaseEntity { */ @Excel(name = "品牌名称") @ApiModelProperty(name = "品牌名称", value = "品牌名称", required = true) - private String nam; + private String name; /** * LOGO @@ -72,7 +72,7 @@ public class BrandInfo extends BaseEntity { */ public static BrandInfo queryBuild(BrandInfoQueryReq brandInfoQueryReq) { return BrandInfo.builder() - .nam(brandInfoQueryReq.getNam()) + .name(brandInfoQueryReq.getNam()) .logo(brandInfoQueryReq.getLogo()) .start(brandInfoQueryReq.getStart()) .introduction(brandInfoQueryReq.getIntroduction()) @@ -84,7 +84,7 @@ public class BrandInfo extends BaseEntity { */ public static BrandInfo saveBuild(BrandInfoSaveReq brandInfoSaveReq) { return BrandInfo.builder() - .nam(brandInfoSaveReq.getNam()) + .name(brandInfoSaveReq.getNam()) .logo(brandInfoSaveReq.getLogo()) .start(brandInfoSaveReq.getStart()) .introduction(brandInfoSaveReq.getIntroduction()) @@ -98,7 +98,7 @@ public class BrandInfo extends BaseEntity { public static BrandInfo editBuild(Long id, BrandInfoEditReq brandInfoEditReq) { return BrandInfo.builder() .id(id) - .nam(brandInfoEditReq.getNam()) + .name(brandInfoEditReq.getNam()) .logo(brandInfoEditReq.getLogo()) .start(brandInfoEditReq.getStart()) .introduction(brandInfoEditReq.getIntroduction()) diff --git a/muyu-modules/muyu-product/muyu-product-service/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-service/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java index 4f49bff..95cbc49 100644 --- a/muyu-modules/muyu-product/muyu-product-service/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-service/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java @@ -34,8 +34,8 @@ public class BrandInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - if (ObjUtils.notNull(brandInfo.getNam())){ - queryWrapper.like(BrandInfo::getNam, brandInfo.getNam()); + if (ObjUtils.notNull(brandInfo.getName())){ + queryWrapper.like(BrandInfo::getName, brandInfo.getName()); } if (ObjUtils.notNull(brandInfo.getLogo())){ diff --git a/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/BrandInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/BrandInfoMapper.xml index eeeea6d..5751a4e 100644 --- a/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/BrandInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/BrandInfoMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,6 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, nam, logo, start, introduction, remark, create_by, create_time, update_by, update_time from brand_info + select id, name, logo, start, introduction, remark, create_by, create_time, update_by, update_time from brand_info diff --git a/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/CategoryInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/CategoryInfoMapper.xml index 99be65b..2c854b9 100644 --- a/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/CategoryInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/CategoryInfoMapper.xml @@ -9,6 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -19,6 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, image, parent_id, start, introduction, remark, create_by, create_time, update_by, update_time from category_info + select id, name, image, parent_id, parent_name,order_num,ancestors,start, introduction, remark, create_by, create_time, update_by, update_time from category_info