Martin
/
yjz_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

day_01
yuanjunzhe 2024-03-12 15:00:12 +08:00
parent df44b8bfc8
commit 6521c5a5a4
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java
View File

@ -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())

4
muyu-modules/muyu-product/muyu-product-service/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java
View File

@ -34,8 +34,8 @@ public class BrandInfoServiceImpl extends ServiceImpl<BrandInfoMapper, BrandInfo
LambdaQueryWrapper<BrandInfo> 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())){

4
muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/BrandInfoMapper.xml
View File

@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.muyu.product.domain.BrandInfo" id="BrandInfoResult">
<result property="id" column="id" />
<result property="nam" column="nam" />
<result property="name" column="name" />
<result property="logo" column="logo" />
<result property="start" column="start" />
<result property="introduction" column="introduction" />
@ -18,6 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBrandInfoVo">
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
</sql>
</mapper>

5
muyu-modules/muyu-product/muyu-product-service/src/main/resources/mapper/product/CategoryInfoMapper.xml
View File

@ -9,6 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="name" column="name" />
<result property="image" column="image" />
<result property="parentId" column="parent_id" />
<result property="parentName" column="parent_name" />
<result property="orderNum" column="order_num" />
<result property="ancestors" column="ancestors" />
<result property="start" column="start" />
<result property="introduction" column="introduction" />
<result property="remark" column="remark" />
@ -19,6 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectCategoryInfoVo">
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
</sql>
</mapper>