提交定制酒代码

.gitignore

@@ -24,4 +24,3 @@ Thumbs.db
 *.jar
 *.war
 *.ear
-/target

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/controller/CategoryInfoController.java

@@ -0,0 +1,127 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import org.springblade.modules.mall.service.ICategoryInfoService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 类别表 控制器
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/categoryinfo")
+@Api(value = "类别表", tags = "类别表接口")
+public class CategoryInfoController extends BladeController {
+
+	private final ICategoryInfoService categoryInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入categoryInfo")
+	public R<CategoryInfo> detail(CategoryInfo categoryInfo) {
+		CategoryInfo detail = categoryInfoService.getOne(Condition.getQueryWrapper(categoryInfo));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 类别表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入categoryInfo")
+	public R<IPage<CategoryInfo>> list(CategoryInfo categoryInfo, Query query) {
+		IPage<CategoryInfo> pages = categoryInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(categoryInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 类别表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入categoryInfo")
+	public R<IPage<CategoryInfoVO>> page(CategoryInfoVO categoryInfo, Query query) {
+		IPage<CategoryInfoVO> pages = categoryInfoService.selectCategoryInfoPage(Condition.getPage(query), categoryInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 类别表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入categoryInfo")
+	public R save(@Valid @RequestBody CategoryInfo categoryInfo) {
+		return R.status(categoryInfoService.save(categoryInfo));
+	}
+
+	/**
+	 * 修改 类别表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入categoryInfo")
+	public R update(@Valid @RequestBody CategoryInfo categoryInfo) {
+		return R.status(categoryInfoService.updateById(categoryInfo));
+	}
+
+	/**
+	 * 新增或修改 类别表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入categoryInfo")
+	public R submit(@Valid @RequestBody CategoryInfo categoryInfo) {
+		return R.status(categoryInfoService.saveOrUpdate(categoryInfo));
+	}
+
+	
+	/**
+	 * 删除 类别表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(categoryInfoService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/dto/CategoryInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import org.springblade.modules.mall.entity.CategoryInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 类别表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CategoryInfoDTO extends CategoryInfo {
+	private static final long serialVersionUID = 1L;
+
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/entity/CategoryInfo.java

@@ -0,0 +1,63 @@
+package org.springblade.modules.mall.entity;
+
+import org.springblade.common.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 类别表实体类
+ *
+ * @author zzyd
+ * @since 2023-02-10
+ */
+@Data
+@TableName("biz_category_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CategoryInfo对象", description = "类别表")
+public class CategoryInfo extends BaseEntity<CategoryInfo> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 分类名称
+	*/
+	@ApiModelProperty(value = "分类名称")
+	private String title;
+	/**
+	* 0
+	*/
+	@ApiModelProperty(value = "0")
+	private String level;
+	/**
+	* 状态;1：有效；0：无效；
+	*/
+	@ApiModelProperty(value = "状态;1：有效；0：无效；")
+	private Integer state;
+	/**
+	* 排序
+	*/
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	* 分类图标
+	*/
+	@ApiModelProperty(value = "分类图标")
+	private String logo;
+	/**
+	* 分类父id
+	*/
+	@ApiModelProperty(value = "分类父id")
+	private Long parentId;
+
+
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/mapper/CategoryInfoMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 类别表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+public interface CategoryInfoMapper extends BaseMapper<CategoryInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param categoryInfo
+	 * @return
+	 */
+	List<CategoryInfoVO> selectCategoryInfoPage(IPage page, CategoryInfoVO categoryInfo);
+
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/mapper/CategoryInfoMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.CategoryInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="categoryInfoResultMap" type="org.springblade.modules.mall.entity.CategoryInfo">
+        <result column="id" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="title" property="title"/>
+        <result column="level" property="level"/>
+        <result column="state" property="state"/>
+        <result column="sort" property="sort"/>
+        <result column="logo" property="logo"/>
+        <result column="parent_id" property="parentId"/>
+    </resultMap>
+
+
+    <select id="selectCategoryInfoPage" resultMap="categoryInfoResultMap">
+        select * from biz_category_info where is_deleted = 0
+    </select>
+
+</mapper>

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/service/ICategoryInfoService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 类别表 服务类
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+public interface ICategoryInfoService extends IService<CategoryInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param categoryInfo
+	 * @return
+	 */
+	IPage<CategoryInfoVO> selectCategoryInfoPage(IPage<CategoryInfoVO> page, CategoryInfoVO categoryInfo);
+
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/service/impl/CategoryInfoServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import org.springblade.modules.mall.mapper.CategoryInfoMapper;
+import org.springblade.modules.mall.service.ICategoryInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 类别表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+@Service
+public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, CategoryInfo> implements ICategoryInfoService {
+
+	@Override
+	public IPage<CategoryInfoVO> selectCategoryInfoPage(IPage<CategoryInfoVO> page, CategoryInfoVO categoryInfo) {
+		return page.setRecords(baseMapper.selectCategoryInfoPage(page, categoryInfo));
+	}
+
+}

blade-ops/blade-develop/src/main/java/org/springblade/modules/mall/vo/CategoryInfoVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import org.springblade.modules.mall.entity.CategoryInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 类别表视图实体类
+ *
+ * @author BladeX
+ * @since 2023-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CategoryInfoVO对象", description = "类别表")
+public class CategoryInfoVO extends CategoryInfo {
+	private static final long serialVersionUID = 1L;
+
+}

blade-ops/blade-develop/src/main/java/sql/categoryinfo.menu.mysql

@@ -0,0 +1,10 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1623947334616383495', 1123598815738675201, 'categoryinfo', '分类管理', 'menu', '/mall/categoryinfo', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1623947334616383496', '1623947334616383495', 'categoryinfo_add', '新增', 'add', '/mall/categoryinfo/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1623947334616383497', '1623947334616383495', 'categoryinfo_edit', '修改', 'edit', '/mall/categoryinfo/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1623947334616383498', '1623947334616383495', 'categoryinfo_delete', '删除', 'delete', '/api/mall/categoryinfo/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1623947334616383499', '1623947334616383495', 'categoryinfo_view', '查看', 'view', '/mall/categoryinfo/view', 'file-text', 4, 2, 2, 1, NULL, 0);

src/main/java/org/springblade/common/enums/StatusEnum.java

@@ -0,0 +1,19 @@
+package org.springblade.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 是否枚举类
+ */
+@Getter
+public enum StatusEnum {
+	ENABLE("启用", 1),
+	UN_ENABLE("禁用", 0);
+	private String name;
+	private Integer value;
+
+	StatusEnum(String name, Integer value) {
+		this.name = name;
+		this.value = value;
+	}
+}

src/main/java/org/springblade/common/generator/BladeCodeGenerator.java

@@ -80,6 +80,7 @@ public class BladeCodeGenerator {
         gc.setServiceImplName("%sServiceImpl");
         gc.setControllerName("%sController");
         gc.setSwagger2(this.isSwagger2);
+        gc.setActiveRecord(true);
         mpg.setGlobalConfig(gc);
         DataSourceConfig dsc = new DataSourceConfig();
         String driverName = Func.toStr(this.driverName, props.getProperty("spring.datasource.driver-class-name"));

src/main/java/org/springblade/modules/api/controller/CommonController.java

@@ -40,6 +40,8 @@ import org.springblade.modules.platform.service.IAdsService;
 import org.springblade.modules.platform.service.IPaymentsService;
 import org.springblade.modules.resource.builder.sms.SmsBuilder;
 import org.springblade.modules.resource.utils.SmsUtil;
+import org.springblade.modules.system.entity.Area;
+import org.springblade.modules.system.service.IAreaService;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.Duration;
@@ -65,6 +67,7 @@ public class CommonController extends BladeController {
 	private final IAdsService adsService;
 	private final SmsBuilder smsBuilder;
 	private final BladeRedis bladeRedis;
+	private final IAreaService areaService;
 
 	@GetMapping("/payments-list")
 	@ApiOperationSupport(order = 1)
@@ -102,4 +105,10 @@ public class CommonController extends BladeController {
 		return smsCode.isSuccess() ? R.data(smsCode, SEND_SUCCESS) : R.fail("发送频率过高，请稍后再试");
 	}
 
+	@ApiOperation(value = "行政区域列表查询", notes = "行政区域列表查询")
+	@GetMapping("/common/area")
+	public List<Area> listDistinct(@ApiParam(value = "行政区域父id，省的pid为0", required = true) @RequestParam("pid") String pid) {
+		return areaService.lambdaQuery().eq(Area::getPid, pid).list();
+	}
+
 }

src/main/java/org/springblade/modules/api/controller/CustomWineController.java

@@ -0,0 +1,112 @@
+package org.springblade.modules.api.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.enums.StatusEnum;
+import org.springblade.common.enums.YesOrNoEnum;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.custom.entity.*;
+import org.springblade.modules.custom.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Author pangqijun
+ * Date 2023/2/13
+ * Description
+ */
+@RestController
+@RequestMapping(CommonConstant.API_URL + "/customWine")
+@Api(value = "公共接口", tags = "08.定制模块接口")
+public class CustomWineController extends BladeController {
+
+    @Autowired
+    private IBottleBodyService bottleBodyService;
+    @Autowired
+    private IBottleCapService bottleCapService;
+    @Autowired
+    private IBottleLabelService bottleLabelService;
+    @Autowired
+    private IWineBoxService wineBoxService;
+    @Autowired
+    private IWineCaseService wineCaseService;
+    @Autowired
+    private IWineBoxStuffingService wineBoxStuffingService;
+    @Autowired
+    private IWineCaseStuffingService wineCaseStuffingService;
+
+
+    @GetMapping("/bottleBody/list")
+    @ApiOperation(value = "获取瓶身列表")
+    public R<List<BottleBody>> getBottleBodyList(Query query) {
+        LambdaQueryWrapper<BottleBody> wrapper = Wrappers.lambdaQuery(BottleBody.class)
+                .eq(BottleBody::getStatus, StatusEnum.ENABLE.getValue()).eq(BottleBody::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<BottleBody> page = bottleBodyService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/bottleCap/list")
+    @ApiOperation(value = "获取酒盖列表")
+    public R<List<BottleCap>> getBottleCapList(Query query) {
+        LambdaQueryWrapper<BottleCap> wrapper = Wrappers.lambdaQuery(BottleCap.class)
+                .eq(BottleCap::getStatus, StatusEnum.ENABLE.getValue()).eq(BottleCap::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<BottleCap> page = bottleCapService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/bottleLabel/list")
+    @ApiOperation(value = "获取标贴列表")
+    public R<List<BottleLabel>> getBottleLabelList(Query query) {
+        LambdaQueryWrapper<BottleLabel> wrapper = Wrappers.lambdaQuery(BottleLabel.class)
+                .eq(BottleLabel::getStatus, StatusEnum.ENABLE.getValue()).eq(BottleLabel::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<BottleLabel> page = bottleLabelService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/wineBox/list")
+    @ApiOperation(value = "获取酒盒列表")
+    public R<List<WineBox>> getWineBoxList(Query query) {
+        LambdaQueryWrapper<WineBox> wrapper = Wrappers.lambdaQuery(WineBox.class)
+                .eq(WineBox::getStatus, StatusEnum.ENABLE.getValue()).eq(WineBox::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<WineBox> page = wineBoxService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/wineCase/list")
+    @ApiOperation(value = "获取酒箱列表")
+    public R<List<WineCase>> getWineCaseList(Query query) {
+        LambdaQueryWrapper<WineCase> wrapper = Wrappers.lambdaQuery(WineCase.class)
+                .eq(WineCase::getStatus, StatusEnum.ENABLE.getValue()).eq(WineCase::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<WineCase> page = wineCaseService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/wineCaseStuffing/list")
+    @ApiOperation(value = "获取酒箱填充物列表")
+    public R<List<WineCaseStuffing>> getWineCaseStuffingList(Query query) {
+        LambdaQueryWrapper<WineCaseStuffing> wrapper = Wrappers.lambdaQuery(WineCaseStuffing.class)
+                .eq(WineCaseStuffing::getStatus, StatusEnum.ENABLE.getValue()).eq(WineCaseStuffing::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<WineCaseStuffing> page = wineCaseStuffingService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+
+    @GetMapping("/wineBoxStuffing/list")
+    @ApiOperation(value = "获取酒盒填充物列表")
+    public R<List<WineBoxStuffing>> getWineBoxStuffingList(Query query) {
+        LambdaQueryWrapper<WineBoxStuffing> wrapper = Wrappers.lambdaQuery(WineBoxStuffing.class)
+                .eq(WineBoxStuffing::getStatus, StatusEnum.ENABLE.getValue()).eq(WineBoxStuffing::getIsDelete, YesOrNoEnum.NO.getValue());
+        IPage<WineBoxStuffing> page = wineBoxStuffingService.page(Condition.getPage(query), wrapper);
+        return data(page.getRecords());
+    }
+}

src/main/java/org/springblade/modules/api/controller/LoginController.java

@@ -223,7 +223,7 @@ public class LoginController extends BladeController {
 	@ApiLog("微信授权登录")
 	@PostMapping("/login/wx-auth")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "微信授权登录", tags = "通过 getPhoneNumberCode 获取手机号")
+	@ApiOperation(value = "微信授权登录", notes = "通过 getPhoneNumberCode 获取手机号")
 	public R wxAuthLogin(@ApiParam(value = "微信code", required = true) @RequestParam String code,
 						 @ApiParam(value = "获取手机号的code，五分钟有效", required = true) @RequestParam String getPhoneNumberCode) {
 

src/main/java/org/springblade/modules/api/controller/MallController.java

@@ -0,0 +1,122 @@
+package org.springblade.modules.api.controller;
+
+/**
+ * Author pangqijun
+ * Date 2023/2/13
+ * Description
+ */
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.enums.GoodsStateEnum;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.api.request.GoodsListRequest;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.service.ICategoryInfoService;
+import org.springblade.modules.mall.service.IGoodsInfoService;
+import org.springblade.modules.mall.service.IGoodsParamsService;
+import org.springblade.modules.mall.service.IGoodsSpecService;
+import org.springblade.modules.mall.service.impl.CategoryInfoServiceImpl;
+import org.springblade.modules.mall.vo.GoodsInfoVO;
+import org.springblade.modules.mall.wrapper.GoodsInfoWrapper;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Author pangqijun
+ * Date 2023/2/13
+ * Description
+ */
+@RestController
+@RequestMapping(CommonConstant.API_URL + "/mall")
+@Api(value = "商城模块接口", tags = "05.商城模块接口")
+public class MallController {
+
+    @Resource
+    private ICategoryInfoService categoryInfoService;
+    @Resource
+    private IGoodsInfoService goodsInfoService;
+    @Resource
+    private IGoodsParamsService goodsParamsService;
+    @Resource
+    private IGoodsSpecService goodsSpecService;
+
+    @GetMapping("/category/list")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "查询分类列表", notes = "查询根分类，parentId传 0 ")
+    public R<List<CategoryInfo>> list(@ApiParam(value = "父分类Id，不传默认为0", defaultValue = "0")
+                                      @RequestParam(value = "parentId", required = false) Long parentId) {
+        parentId = parentId == null ? 0L : parentId;
+        return R.data(categoryInfoService.lambdaQuery().eq(CategoryInfo::getParentId, parentId).orderByAsc(CategoryInfo::getSort).list());
+    }
+
+
+    @GetMapping("/goods/page")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "商品分页接口", notes = "传入goodsInfo")
+    public R<List<GoodsInfoVO>> list(GoodsListRequest request, Query query) {
+        LambdaQueryWrapper<GoodsInfo> wrapper = Wrappers.lambdaQuery(GoodsInfo.class);
+        if (request.getZoneType() != null) {
+            wrapper.eq(GoodsInfo::getZoneType, request.getZoneType());
+        }
+        if (StrUtil.isNotBlank(request.getGoodsCategoryId())) {
+            CategoryInfo categoryInfo = categoryInfoService.getById(request.getGoodsCategoryId());
+            if (categoryInfo.getParentId() == 0) {
+                wrapper.likeRight(GoodsInfo::getGoodsCategoryId, request.getGoodsCategoryId() + "-");
+            } else {
+                wrapper.likeRight(GoodsInfo::getGoodsCategoryId, categoryInfo.getParentId() + "-" + request.getGoodsCategoryId() + "-");
+            }
+        }
+        if (StrUtil.isNotBlank(request.getGoodsName())) {
+            wrapper.like(GoodsInfo::getGoodsName, request.getGoodsName());
+        }
+        wrapper.orderByAsc(GoodsInfo::getSort);
+        if (request.getIsRecom() != null) {
+            wrapper.eq(GoodsInfo::getIsRecom, 1).orderByDesc(GoodsInfo::getTotalViews).orderByDesc(GoodsInfo::getTotalSales);
+        } else {
+            wrapper.orderByAsc(GoodsInfo::getSalePrice);
+        }
+        wrapper.eq(GoodsInfo::getIsSale, GoodsStateEnum.ON_SALE.getValue());
+        wrapper.ge(GoodsInfo::getTotalStock, 1);
+        IPage<GoodsInfo> pages = goodsInfoService.page(Condition.getPage(query), wrapper);
+        List<GoodsInfoVO> goodsInfoVOS = GoodsInfoWrapper.build().listVO(pages.getRecords());
+        return R.data(goodsInfoVOS);
+    }
+
+    @GetMapping("/goods/detail")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "商品详情接口", notes = "传入goodsInfo")
+    public R<GoodsInfoVO> detail(@RequestParam("id") Long id) {
+        GoodsInfo detail = goodsInfoService.detail(id);
+        GoodsInfoVO goodsInfoVO = GoodsInfoWrapper.build().entityVO(detail);
+        List<GoodsParams> goodsParamsList = goodsParamsService.getByGoodsId(id);
+        goodsInfoVO.setGoodsParamsList(goodsParamsList);
+        List<GoodsSpec> goodsSpecList = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, id)
+                .eq(GoodsSpec::getIsSale, GoodsStateEnum.ON_SALE.getValue()).orderByAsc(GoodsSpec::getSalePrice).list();
+        goodsInfoVO.setGoodsSpecList(goodsSpecList);
+        // 增加浏览量
+        detail.setTotalViews(detail.getTotalViews() + 1);
+        goodsInfoService.updateById(detail);
+        return R.data(goodsInfoVO);
+    }
+
+}

src/main/java/org/springblade/modules/api/controller/UserCenterController.java

@@ -0,0 +1,389 @@
+package org.springblade.modules.api.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.RedisTool;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.api.request.*;
+import org.springblade.modules.api.service.IApiService;
+import org.springblade.modules.platform.entity.*;
+import org.springblade.modules.platform.service.*;
+import org.springblade.modules.platform.vo.*;
+import org.springblade.modules.platform.wrapper.UserAddressWrapper;
+import org.springblade.modules.platform.wrapper.UserBankCardsWrapper;
+import org.springblade.modules.system.entity.Region;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserApp;
+import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserAppVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.*;
+
+import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
+
+/**
+ * 控制器
+ *
+ * @author xuwei
+ * @since 2022-02-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(CommonConstant.API_URL)
+@Api(value = "我的", tags = "04.个人中心")
+public class UserCenterController extends BladeController {
+
+	private final IUserAddressService userAddressService;
+	private final IUserFeedbacksService userFeedbacksService;
+	private final IUserService userService;
+	private final IUserRecomService userRecomService;
+	private final IUserBankCardsService userBankCardsService;
+	private final IVersionUpgradeService versionUpgradeService;
+	private final IApiService apiService;
+	private final IRegionService regionService;
+	private final IFreightService freightService;
+	private final IUserCardInfoService userCardInfoService;
+	private final BladeRedis bladeRedis;
+	private final IUserScoresService userScoresService;
+
+	@Resource
+	private RedisTool redisTool;
+	@Resource
+	private UserAppService userAppService;
+
+	@GetMapping("/userApp-detailById")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "获取用户信息")
+	public R<UserAppVO> userDetailById() {
+		return R.data(apiService.getUserAppVo(getUser().getUserId()));
+	}
+
+	@PostMapping("/user-updateById")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "修改用户资料", notes = "传入用户ID")
+	public R userUpdateById(@Valid @RequestBody UserAppUpdateRequest request) {
+		User user = new User();
+		user.setId(request.getUserId());
+		user.setName(request.getName());
+		user.setAvatar(request.getAvatar());
+		user.setSex(request.getSex());
+		user.setBirthday(request.getBirthday());
+		boolean flg = userService.updateById(user);
+		if (flg){
+			//清除缓存
+			bladeRedis.del(String.valueOf(request.getUserId()));
+			CacheUtil.clear(USER_CACHE);
+			return R.success("操作成功");
+		}
+		return R.fail("操作失败");
+	}
+
+	@PostMapping("/userApp-updateByUserId")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "修改简介说明", notes = "传入用户ID")
+	public R userAppUpdateByUserId(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId,
+								   @ApiParam(value = "简介说明", required = true) @RequestParam String userExplain) {
+		UserApp userApp = new UserApp();
+		userApp.setUserExplain(userExplain);
+		boolean flg = userApp.update(Wrappers.<UserApp>lambdaQuery().eq(UserApp::getUserId,userId));
+		if (flg){
+			//清除缓存
+			bladeRedis.del(String.valueOf(userId));
+			return R.success("操作成功");
+		}
+		return R.fail("操作失败");
+	}
+
+	@GetMapping("/userAddress-page")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "查询用户地址数据", notes = "传入用户ID")
+	public R<List<UserAddress>> userAddressPage(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId, Query query) {
+		UserAddress userAddress = new UserAddress();
+		userAddress.setUserId(userId);
+		IPage<UserAddress> list = userAddressService.page(Condition.getPage(query), Condition.getQueryWrapper(userAddress));
+		return R.data(list.getRecords());
+	}
+
+	@GetMapping("/userAddress-detailById")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "查询用户地址详情", notes = "传入地址ID, 0获取地址详情（传入地址ID）,1默认地址状态（用户ID）, 2获取地址详情并返回运费（传入地址ID）")
+	public R<UserAddressVO> userAddressDetailById(@ApiParam(value = "地址ID/用户ID", required = true) @RequestParam Long id,
+												  @ApiParam(value = "类型,默认为0", required = true) @RequestParam Integer type) {
+		UserAddress userAddress = new UserAddress();
+		if (type == 1){
+			userAddress.setUserId(id);
+			userAddress.setDefaultState(2);//默认标识
+			UserAddress query = userAddressService.getOne(Condition.getQueryWrapper(userAddress));
+			if(query == null){
+				return R.fail("该地址不存在");
+			}
+			UserAddressVO vo = UserAddressWrapper.build().entityVO(query);
+			vo.setWlPrice(0D);
+			return R.data(vo);
+		}else if (type == 2){
+			UserAddress query = userAddressService.getById(id);
+			if(query == null){
+				return R.fail("该地址不存在");
+			}
+			UserAddressVO vo = UserAddressWrapper.build().entityVO(query);
+			Region region = regionService.getById(vo.getDistrictCode());
+			vo.setWlPrice(0D);
+			if (region != null){
+				Freight freight = freightService.getOne(Wrappers.<Freight>lambdaQuery().eq(Freight::getCode, region.getProvinceCode()));
+				if (freight != null){
+					vo.setWlPrice(freight.getFreight());
+				}
+			}
+			return R.data(vo);
+		}else{
+			UserAddress query = userAddressService.getById(id);
+			if(query == null){
+				return R.fail("该地址不存在");
+			}
+			UserAddressVO vo = UserAddressWrapper.build().entityVO(query);
+			vo.setWlPrice(0D);
+			return R.data(vo);
+		}
+	}
+
+	@GetMapping("/userAddress-detailByUserId")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "查询用户默认地址", notes = "传入用户ID")
+	public R<UserAddress> userAddressDetailByUserId(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId) {
+		UserAddress userAddress = new UserAddress();
+		userAddress.setUserId(userId);
+		userAddress.setDefaultState(2);//默认标识
+		return R.data(userAddressService.getOne(Condition.getQueryWrapper(userAddress)));
+	}
+
+	@PostMapping("/userAddress-remove")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "删除用户地址", notes = "传入ids,可以批量删除，格式xx,xxx,xx")
+	public R userAddressRemove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+
+		return R.status(userAddressService.removeByIds(Func.toLongList(ids)));
+	}
+
+	@PostMapping("/userAddress-save")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "添加用户地址", notes = "添加用户地址")
+	public R userAddressSave(@Valid @RequestBody AddressSaveRequest request) {
+		if(StringUtil.isNotBlank(request.getPhone()) && !PhoneUtil.isMobile(request.getPhone())){
+			return R.fail("请输入正确的手机号");
+		}
+		if(StringUtil.isEmpty(request.getUserId())){
+			return R.fail("请求参数错误！");
+		}
+		UserAddress userAddress = Objects.requireNonNull(BeanUtil.copy(request, UserAddress.class));
+		if (StringUtil.isEmpty(request.getDefaultState())){
+			userAddress.setDefaultState(1);
+		}
+		if (StringUtil.isEmpty(request.getDetail())){
+			return R.fail("请输入详细地址！");
+		}
+		userAddress.setCreateTime(DateUtil.now());
+		//设置默认地址
+		if (userAddress.getDefaultState() == 2){
+			//用户所有的改为不默认
+			UserAddress param = new UserAddress();
+			param.setUserId(request.getUserId());
+			UserAddress entity= new UserAddress();
+			entity.setDefaultState(1);
+			userAddressService.update(entity, Condition.getQueryWrapper(param));
+			//清除缓存
+			bladeRedis.del(String.valueOf(request.getUserId()));
+		}
+		return R.status(userAddressService.save(userAddress));
+	}
+
+	@PostMapping("/userAddress-update")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "修改用户收货地址", notes = "修改用户地址")
+	public R userAddressUpdate(@Valid @RequestBody AddressUpdateRequest request) {
+		/*if(StringUtil.isNotBlank(request.getPhone()) && !PhoneUtil.isMobile(request.getPhone())){
+			return R.fail("请输入正确的手机号");
+		}*/
+		UserAddress userAddress = Objects.requireNonNull(BeanUtil.copy(request, UserAddress.class));
+		userAddress.setUpdateTime(DateUtil.now());
+		if (userAddress.getDefaultState() == 2){
+			UserAddress entity= new UserAddress();
+			entity.setDefaultState(1);
+			UserAddress param = new UserAddress();
+			param.setUserId(request.getUserId());
+			userAddressService.update(entity, Condition.getQueryWrapper(param));
+		}
+		return R.status(userAddressService.updateById(userAddress));
+	}
+
+	@GetMapping("/userFeedbacks-page")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "查询反馈意见数据", notes = "传入用户ID")
+	public R<List<UserFeedbacks>> userFeedbacksPage(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId, Query query) {
+		UserFeedbacks userFeedbacks = new UserFeedbacks();
+		userFeedbacks.setUserId(userId);
+		IPage<UserFeedbacks> list = userFeedbacksService.page(Condition.getPage(query),
+			Condition.getQueryWrapper(userFeedbacks).lambda().orderByAsc(UserFeedbacks::getCreateTime));
+		return R.data(list.getRecords());
+	}
+
+	@GetMapping("/userFeedbacks-detailById")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "反馈意见详情", notes = "传入意见ID")
+	public R<UserFeedbacks> userFeedbacksDetailById(@ApiParam(value = "意见ID", required = true) @RequestParam String id) {
+		return R.data(userFeedbacksService.getById(id));
+	}
+
+	@PostMapping("/userFeedbacks-save")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "添加反馈意见", notes = "添加反馈意见")
+	public R userFeedbacksSave(@Valid @RequestBody UserFeedbacksSaveRequest request) {
+		UserFeedbacks userFeedbacks = Objects.requireNonNull(BeanUtil.copy(request, UserFeedbacks.class));
+		userFeedbacks.setCreateTime(DateUtil.now());
+		return R.status(userFeedbacksService.save(userFeedbacks));
+	}
+
+	@PostMapping("/getMyDetail")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询个人数据")
+	public R getMyDetail(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId){
+		UserApp userApp = new UserApp();
+		UserApp app = userApp.selectOne(Condition.getQueryWrapper(userApp).lambda().eq(UserApp::getUserId, userId));
+		User user = userService.getById(userId);
+		Map<Object, Object> map = new HashMap<>();
+		map.put("nowMoney", app.getNowMoney());//余额
+		map.put("redMoney", app.getRedMoney());//红包余额
+		map.put("ticket", app.getTicket());//绿色积分
+		map.put("account", user.getAccount());//账号
+		return R.data(map);
+	}
+
+	@PostMapping("/getUserByAccount")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "通过电话查询个人数据")
+	public R getUserByAccount(@ApiParam(value = "用户电话", required = true) @RequestParam Long account){
+		User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getAccount, account));
+		if(ObjectUtil.isNull(user)){
+			return R.fail("用户电话不正确，查询不到用户请核实");
+		}
+		UserApp userApp = new UserApp();
+		UserApp app = userApp.selectOne(Condition.getQueryWrapper(userApp).lambda().eq(UserApp::getUserId, user.getId()));
+		User parentUser = userService.getById(app.getParentId());
+		Map<Object, Object> map = new HashMap<>();
+		map.put("nowMoney", app.getNowMoney());//余额
+		map.put("redMoney", app.getRedMoney());//余额
+		map.put("ticket", app.getTicket());//绿色积分
+		map.put("integral", app.getIntegral());//红色积分
+		map.put("userId", user.getId());//用户id
+		map.put("userName", user.getRealName());//用户id
+		map.put("account", account);//用户电话
+		map.put("parentUserName", parentUser.getRealName());//推荐人名称
+		map.put("parentUserAccount", parentUser.getAccount());//推荐人电话
+
+		String roleName = "";
+		if(app.getIsRole() == 1){
+			roleName = "城市合伙人";
+		}else if(app.getIsRole() == 2){
+			roleName = "创客";
+		}else {
+			roleName = "城市合伙人,创客";
+		}
+		map.put("roleName", roleName);//用户角色名称
+		return R.data(map);
+	}
+
+
+
+
+	@GetMapping("/userBankCards-page")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "查询用户银行卡数据", notes = "传入用户ID")
+	public R<List<UserBankCardsVO>> userBankCardsPage(@ApiParam(value = "用户ID", required = true) @RequestParam Long userId, Query query) {
+		UserBankCards userBankCards = new UserBankCards();
+		userBankCards.setUserId(userId);
+		IPage<UserBankCards> list = userBankCardsService.page(Condition.getPage(query),
+			Condition.getQueryWrapper(userBankCards).lambda().orderByAsc(UserBankCards::getSort));
+		return R.data(UserBankCardsWrapper.build().listVO(list.getRecords()));
+	}
+
+
+
+	@PostMapping("/userBankCards-update")
+	@ApiOperationSupport(order = 16)
+	@ApiOperation(value = "修改银行卡", notes = "传入主键ID")
+	public R userBankCardsUpdate(@Valid @RequestBody UserBankCardsUpdateRequest request) {
+		UserBankCards userBankCards = Objects.requireNonNull(BeanUtil.copy(request, UserBankCards.class));
+		userBankCards.setUpdateTime(DateUtil.now());
+		return R.status(userBankCardsService.updateById(userBankCards));
+	}
+
+
+
+	@GetMapping("/versionUpgrade")
+	@ApiOperationSupport(order = 22)
+	@ApiOperation(value = "获取最新版本", notes = "获取最新版本")
+	public R<VersionUpgrade> versionUpgrade(@RequestParam(value = "userVersionName", required = false) String userVersionName) {
+		if (StrUtil.isNotBlank(userVersionName)) {
+			// 记录用户版本号
+			Long userId = AuthUtil.getUserId();
+			User user = userService.getById(userId);
+			if (user != null && userVersionName.equals(user.getUserAppVersion())) {
+				user.setUserAppVersion(userVersionName);
+				userService.updateById(user);
+			}
+		}
+		VersionUpgrade versionUpgrade = versionUpgradeService.getOne(Wrappers.<VersionUpgrade>lambdaQuery()
+			.eq(VersionUpgrade::getStatus ,2).orderByDesc(VersionUpgrade::getVersionCode).orderByDesc(VersionUpgrade::getSort),false);
+		return R.data(versionUpgrade);
+	}
+
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 22)
+	@ApiOperation(value = "查询用户实名认证", notes = "传入userCardInfo")
+	public R<UserCardInfo> detail(UserCardInfo userCardInfo) {
+		UserCardInfo detail = userCardInfoService.getOne(Condition.getQueryWrapper(userCardInfo));
+		return R.data(detail);
+	}
+
+	@ApiOperation(value = "获取信誉分记录")
+	@GetMapping("/getCreditScoreRecords")
+	public R<List<UserScores>> getCreditScoreRecords(Query query) {
+		LambdaQueryWrapper<UserScores> wrapper = Wrappers.lambdaQuery(UserScores.class).eq(UserScores::getUserId, AuthUtil.getUserId()).orderByDesc(UserScores::getCreateTime);
+		IPage<UserScores> pages = userScoresService.page(Condition.getPage(query), wrapper);
+		return R.data(pages.getRecords());
+	}
+
+	@ApiOperation(value = "注销")
+	@PostMapping("/logOut")
+	public R logOut(){
+		User user = userService.getById(AuthUtil.getUserId());
+		if(ObjectUtil.isNotNull(user.getLogOut()) && user.getLogOut() == 1){
+			return R.fail("用户已注销，无法重复注销");
+		}
+		user.setLogOut(1);
+		return R.status(userService.updateUser(user));
+	}
+}

src/main/java/org/springblade/modules/api/request/AddressSaveRequest.java

@@ -0,0 +1,83 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * 地址请求实体
+ *
+ * @author xuwei
+ */
+@Data
+@ApiModel(value = "新增用户地址实体对象", description = "请求实体类")
+public class AddressSaveRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	@NotEmpty(message = "姓名不能为空")
+	@ApiModelProperty(value = "收货人姓名")
+	private String realName;
+
+	@NotEmpty(message = "手机号不能为空")
+	@ApiModelProperty(value = "收货人电话")
+	private String phone;
+
+	@NotEmpty(message = "请选择地址")
+	@ApiModelProperty(value = "收货人所在省")
+	private String province;
+
+	@NotEmpty(message = "请选择地址")
+	@ApiModelProperty(value = "收货人所在市")
+	private String city;
+
+	@NotEmpty(message = "请选择地址")
+	@ApiModelProperty(value = "收货人所在区")
+	private String district;
+
+	@NotEmpty(message = "请选择街道")
+	@ApiModelProperty(value = "收货人所在街道")
+	private String street;
+
+	@ApiModelProperty(value = "收货人所在市code")
+	private Integer districtCode;
+
+	@ApiModelProperty(value = "收货人详细地址" )
+	private String detail;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private String lng;
+
+	@ApiModelProperty(value = "纬度")
+	private String lat;
+
+	@ApiModelProperty(value = "默认标识")
+	private Integer defaultState;
+
+
+}

src/main/java/org/springblade/modules/api/request/AddressUpdateRequest.java

@@ -0,0 +1,76 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 地址请求实体
+ *
+ * @author xuwei
+ */
+@Data
+@ApiModel(value = "新增用户地址实体对象", description = "请求实体类")
+public class AddressUpdateRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户地址id")
+	private Long id;
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	@ApiModelProperty(value = "收货人姓名")
+	private String realName;
+
+	@ApiModelProperty(value = "收货人电话")
+	private String phone;
+
+	@ApiModelProperty(value = "收货人所在省")
+	private String province;
+
+	@ApiModelProperty(value = "收货人所在市")
+	private String city;
+
+	@ApiModelProperty(value = "收货人所在区")
+	private String district;
+
+	@ApiModelProperty(value = "收货人所在市ID")
+	private Integer districtCode;
+
+	@ApiModelProperty(value = "收货人详细地址")
+	private String detail;
+
+	@ApiModelProperty(value = "邮编")
+	private String postCode;
+
+	@ApiModelProperty(value = "经度")
+	private String lng;
+
+	@ApiModelProperty(value = "纬度")
+	private String lat;
+
+	@ApiModelProperty(value = "默认标识")
+	private Integer defaultState;
+
+
+}

src/main/java/org/springblade/modules/api/request/GoodsListRequest.java

@@ -0,0 +1,19 @@
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GoodsListRequest {
+	@ApiModelProperty(value = "分类ID")
+	private String goodsCategoryId;
+	@ApiModelProperty(value = "专区类型;1-绿色积分专区 2-积分兑换专区 3-红色积分专区")
+	private Integer zoneType;
+	@ApiModelProperty(value = "商品名称")
+	private String goodsName;
+	@ApiModelProperty(value = "是否推荐;1-是  0-否")
+	private Integer isRecom;
+	@ApiModelProperty(value = "活动日期字符串格式yyyy-MM-dd")
+	private String activityDate;
+
+}

src/main/java/org/springblade/modules/api/request/UserAppUpdateRequest.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@ApiModel(value = "UserAppVO对象", description = "UserAppVO对象")
+public class UserAppUpdateRequest implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户ID")
+	private Long userId;
+
+	/**
+	 * 昵称
+	 */
+	@ApiModelProperty(value = "昵称")
+	private String name;
+
+	/**
+	 * 头像
+	 */
+	@ApiModelProperty(value = "头像")
+	private String avatar;
+
+	/**
+	 * 生日
+	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@ApiModelProperty(value = "生日,格式yyyy-MM-dd")
+	private Date birthday;
+	/**
+	 * 性别
+	 */
+	@ApiModelProperty(value = "性别：1男，2女")
+	private Integer sex;
+
+}

src/main/java/org/springblade/modules/api/request/UserBankCardsSaveRequest.java

@@ -0,0 +1,86 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户银行卡信息表实体类
+ *
+ * @author BladeX
+ * @since 2022-02-19
+ */
+@Data
+@ApiModel(value = "用户银行卡保存对象", description = "请求实体类")
+public class UserBankCardsSaveRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 银行Id
+	 */
+	@ApiModelProperty(value = "银行Id")
+	private Long bankId;
+
+	/**
+	 * 用户Id
+	 */
+	@ApiModelProperty(value = "用户Id")
+	private Long userId;
+	/**
+	 * 账户姓名
+	 */
+	@ApiModelProperty(value = "账户姓名")
+	private String name;
+	/**
+	 * 银行开预留手机号
+	 */
+	@ApiModelProperty(value = "银行开预留手机号")
+	private String mobile;
+	/**
+	 * 身份证
+	 */
+	@ApiModelProperty(value = "身份证")
+	private String cardCode;
+	/**
+	 * 银行卡号
+	 */
+	@ApiModelProperty(value = "银行卡号")
+	private String backNo;
+
+	/**
+	 * 区域编号
+	 */
+	@ApiModelProperty(value = "银行卡简称")
+	private String areaCode;
+
+	/**
+	 * 区域名称
+	 */
+	@ApiModelProperty(value = "银行卡开户行")
+	private String areaName;
+
+	@ApiModelProperty(value = "验证码")
+	private String vericode;
+
+	@ApiModelProperty(value = "请求号")
+	private String requestNo;
+}

src/main/java/org/springblade/modules/api/request/UserBankCardsUpdateRequest.java

@@ -0,0 +1,77 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户银行卡信息表实体类
+ *
+ * @author BladeX
+ * @since 2022-02-19
+ */
+@Data
+@ApiModel(value = "用户银行卡保存对象", description = "请求实体类")
+public class UserBankCardsUpdateRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@ApiModelProperty(value = "主键ID")
+	private Long id;
+
+	/**
+	 * 银行Id
+	 */
+	@ApiModelProperty(value = "银行Id")
+	private Long bankId;
+
+	/**
+	 * 账户姓名
+	 */
+	@ApiModelProperty(value = "账户姓名")
+	private String name;
+	/**
+	 * 银行开预留手机号
+	 */
+	@ApiModelProperty(value = "银行开预留手机号")
+	private String mobile;
+
+	/**
+	 * 银行卡号
+	 */
+	@ApiModelProperty(value = "银行卡号")
+	private String backNo;
+
+	/**
+	 * 区域编号
+	 */
+	@ApiModelProperty(value = "区域编号")
+	private String areaCode;
+
+	/**
+	 * 区域名称
+	 */
+	@ApiModelProperty(value = "区域名称")
+	private String areaName;
+}

src/main/java/org/springblade/modules/api/request/UserFeedbacksSaveRequest.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户反馈表实体类
+ *
+ * @author BladeX
+ * @since 2022-02-13
+ */
+@Data
+@ApiModel(value = "用户返回请求实体对象", description = "请求实体类")
+public class UserFeedbacksSaveRequest implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户ID")
+	private Long userId;
+
+	@ApiModelProperty(value = "反馈类型")
+	private Integer type;
+
+	@ApiModelProperty(value = "反馈内容")
+	private String content;
+
+	@ApiModelProperty(value = "联系电话")
+	private String phone;
+
+}

src/main/java/org/springblade/modules/api/vo/FullReductionDetailVO.java

@@ -0,0 +1,25 @@
+package org.springblade.modules.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Author pangqijun
+ * Date 2022/10/30
+ * Description
+ */
+@Data
+public class FullReductionDetailVO {
+	@ApiModelProperty(value = "红色积分倍数")
+	private Double multiple;
+	@ApiModelProperty(value = "优惠金额")
+	private Double discountAmount;
+	@ApiModelProperty("绿色积分")
+	private Double greenIntegral;
+	@ApiModelProperty("红色积分")
+	private Double redIntegral;
+	@ApiModelProperty("五倍红色积分")
+	private Double redIntegralTwo;
+	@ApiModelProperty("合计金额")
+	private Double totalAmount;
+}

src/main/java/org/springblade/modules/api/vo/FullReductionVO.java

@@ -0,0 +1,17 @@
+package org.springblade.modules.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Author pangqijun
+ * Date 2022/10/30
+ * Description
+ */
+@Data
+public class FullReductionVO {
+	@ApiModelProperty(value = "满(优惠需满足的付款金额条件)")
+	private Double full;
+	@ApiModelProperty(value = "减(优惠金额)")
+	private Double reduction;
+}

src/main/java/org/springblade/modules/api/vo/LogisticVO.java

@@ -0,0 +1,17 @@
+package org.springblade.modules.api.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Author pangqijun
+ * Date 2022/6/30
+ * Description
+ */
+@Data
+public class LogisticVO {
+	private String message;
+
+	private Date time;
+}

src/main/java/org/springblade/modules/custom/controller/BaseWineController.java

@@ -0,0 +1,127 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.custom.entity.BaseWine;
+import org.springblade.modules.custom.vo.BaseWineVO;
+import org.springblade.modules.custom.service.IBaseWineService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 基酒表 控制器
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("custom/basewine")
+@Api(value = "基酒表", tags = "基酒表接口")
+public class BaseWineController extends BladeController {
+
+	private final IBaseWineService baseWineService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入baseWine")
+	public R<BaseWine> detail(BaseWine baseWine) {
+		BaseWine detail = baseWineService.getOne(Condition.getQueryWrapper(baseWine));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 基酒表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入baseWine")
+	public R<IPage<BaseWine>> list(BaseWine baseWine, Query query) {
+		IPage<BaseWine> pages = baseWineService.page(Condition.getPage(query), Condition.getQueryWrapper(baseWine));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 基酒表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入baseWine")
+	public R<IPage<BaseWineVO>> page(BaseWineVO baseWine, Query query) {
+		IPage<BaseWineVO> pages = baseWineService.selectBaseWinePage(Condition.getPage(query), baseWine);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 基酒表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入baseWine")
+	public R save(@Valid @RequestBody BaseWine baseWine) {
+		return R.status(baseWineService.save(baseWine));
+	}
+
+	/**
+	 * 修改 基酒表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入baseWine")
+	public R update(@Valid @RequestBody BaseWine baseWine) {
+		return R.status(baseWineService.updateById(baseWine));
+	}
+
+	/**
+	 * 新增或修改 基酒表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入baseWine")
+	public R submit(@Valid @RequestBody BaseWine baseWine) {
+		return R.status(baseWineService.saveOrUpdate(baseWine));
+	}
+
+	
+	/**
+	 * 删除 基酒表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(baseWineService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/modules/custom/dto/BaseWineDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.dto;
+
+import org.springblade.modules.custom.entity.BaseWine;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 基酒表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BaseWineDTO extends BaseWine {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/custom/entity/BaseWine.java

@@ -0,0 +1,62 @@
+package org.springblade.modules.custom.entity;
+
+import java.math.BigDecimal;
+import org.springblade.common.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 基酒表实体类
+ *
+ * @author zzyd
+ * @since 2023-02-08
+ */
+@Data
+@TableName("biz_base_wine")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "BaseWine对象", description = "基酒表")
+public class BaseWine extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 名称
+	*/
+	@ApiModelProperty(value = "名称")
+	private String name;
+	/**
+	* 图片
+	*/
+	@ApiModelProperty(value = "图片")
+	private String image;
+	/**
+	* 介绍
+	*/
+	@ApiModelProperty(value = "介绍")
+	private String introduce;
+	/**
+	* 价格
+	*/
+	@ApiModelProperty(value = "价格")
+	private BigDecimal price;
+	/**
+	* 销量
+	*/
+	@ApiModelProperty(value = "销量")
+	private Integer salesVolume;
+	/**
+	* 排序
+	*/
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	* 状态 0-禁用 1-启用
+	*/
+	@ApiModelProperty(value = "状态 0-禁用 1-启用")
+	private Integer status;
+
+
+}

src/main/java/org/springblade/modules/custom/entity/BottleBody.java

@@ -57,6 +57,10 @@ public class BottleBody extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态;0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/entity/BottleCap.java

@@ -68,6 +68,10 @@ public class BottleCap extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum;
 
 }

src/main/java/org/springblade/modules/custom/entity/BottleLabel.java

@@ -52,6 +52,10 @@ public class BottleLabel extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/entity/WineBox.java

@@ -67,6 +67,10 @@ public class WineBox extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/entity/WineBoxStuffing.java

@@ -52,6 +52,10 @@ public class WineBoxStuffing extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/entity/WineCase.java

@@ -67,6 +67,10 @@ public class WineCase extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/entity/WineCaseStuffing.java

@@ -52,6 +52,10 @@ public class WineCaseStuffing extends BaseEntity {
 	*/
 	@ApiModelProperty(value = "状态 0-禁用 1-启用")
 	private Integer status;
-
+	/**
+	 * 默认数量
+	 */
+	@ApiModelProperty(value = "默认数量")
+	private Integer defaultNum ;
 
 }

src/main/java/org/springblade/modules/custom/mapper/BaseWineMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.mapper;
+
+import org.springblade.modules.custom.entity.BaseWine;
+import org.springblade.modules.custom.vo.BaseWineVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 基酒表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+public interface BaseWineMapper extends BaseMapper<BaseWine> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param baseWine
+	 * @return
+	 */
+	List<BaseWineVO> selectBaseWinePage(IPage page, BaseWineVO baseWine);
+
+}

src/main/java/org/springblade/modules/custom/mapper/BaseWineMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.custom.mapper.BaseWineMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="baseWineResultMap" type="org.springblade.modules.custom.entity.BaseWine">
+        <result column="id" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="name" property="name"/>
+        <result column="image" property="image"/>
+        <result column="introduce" property="introduce"/>
+        <result column="price" property="price"/>
+        <result column="sales_volume" property="salesVolume"/>
+        <result column="sort" property="sort"/>
+        <result column="status" property="status"/>
+    </resultMap>
+
+
+    <select id="selectBaseWinePage" resultMap="baseWineResultMap">
+        select * from biz_base_wine where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/custom/service/IBaseWineService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.service;
+
+import org.springblade.modules.custom.entity.BaseWine;
+import org.springblade.modules.custom.vo.BaseWineVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 基酒表 服务类
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+public interface IBaseWineService extends IService<BaseWine> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param baseWine
+	 * @return
+	 */
+	IPage<BaseWineVO> selectBaseWinePage(IPage<BaseWineVO> page, BaseWineVO baseWine);
+
+}

src/main/java/org/springblade/modules/custom/service/impl/BaseWineServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.service.impl;
+
+import org.springblade.modules.custom.entity.BaseWine;
+import org.springblade.modules.custom.vo.BaseWineVO;
+import org.springblade.modules.custom.mapper.BaseWineMapper;
+import org.springblade.modules.custom.service.IBaseWineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 基酒表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+@Service
+public class BaseWineServiceImpl extends ServiceImpl<BaseWineMapper, BaseWine> implements IBaseWineService {
+
+	@Override
+	public IPage<BaseWineVO> selectBaseWinePage(IPage<BaseWineVO> page, BaseWineVO baseWine) {
+		return page.setRecords(baseMapper.selectBaseWinePage(page, baseWine));
+	}
+
+}

src/main/java/org/springblade/modules/custom/vo/BaseWineVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.custom.vo;
+
+import org.springblade.modules.custom.entity.BaseWine;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 基酒表视图实体类
+ *
+ * @author BladeX
+ * @since 2023-02-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "BaseWineVO对象", description = "基酒表")
+public class BaseWineVO extends BaseWine {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/controller/BrandsInfoController.java

@@ -0,0 +1,164 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.BrandsInfo;
+import org.springblade.modules.mall.service.IBrandsInfoService;
+import org.springblade.modules.mall.vo.BrandsInfoVO;
+import org.springblade.modules.mall.wrapper.BrandsInfoWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 品牌信息表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/brandsinfo")
+@Api(value = "品牌信息表", tags = "品牌信息表接口")
+public class BrandsInfoController extends BladeController {
+
+	private final IBrandsInfoService brandsInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入brandsInfo")
+	public R<BrandsInfoVO> detail(BrandsInfo brandsInfo) {
+		BrandsInfo detail = brandsInfoService.getOne(Condition.getQueryWrapper(brandsInfo));
+		return R.data(BrandsInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 品牌信息表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入brandsInfo")
+	public R<IPage<BrandsInfoVO>> list(BrandsInfo brandsInfo, Query query) {
+		IPage<BrandsInfo> pages = brandsInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(brandsInfo));
+		return R.data(BrandsInfoWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 品牌信息表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入brandsInfo")
+	public R<IPage<BrandsInfoVO>> page(BrandsInfoVO brandsInfo, Query query) {
+		IPage<BrandsInfoVO> pages = brandsInfoService.selectBrandsInfoPage(Condition.getPage(query), brandsInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 品牌信息表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入brandsInfo")
+	public R save(@Valid @RequestBody BrandsInfo brandsInfo) {
+		return R.status(brandsInfoService.save(brandsInfo));
+	}
+
+	/**
+	 * 修改 品牌信息表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入brandsInfo")
+	public R update(@Valid @RequestBody BrandsInfo brandsInfo) {
+		return R.status(brandsInfoService.updateById(brandsInfo));
+	}
+
+	/**
+	 * 新增或修改 品牌信息表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入brandsInfo")
+	public R submit(@Valid @RequestBody BrandsInfo brandsInfo) {
+		if (brandsInfo.getId() == null) {
+			BrandsInfo detail = brandsInfoService.getOne(Wrappers.lambdaQuery(BrandsInfo.class)
+				.eq(BrandsInfo::getBrandName, brandsInfo.getBrandName()));
+			if (detail != null) {
+				return R.fail("品牌已存在");
+			}
+		}
+		return R.status(brandsInfoService.saveOrUpdate(brandsInfo));
+	}
+
+
+	/**
+	 * 删除 品牌信息表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(brandsInfoService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 根据名称查询品牌
+	 */
+	@GetMapping("/getByName")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "根据名称查询品牌", notes = "传入brandsInfo")
+	public R<List<BrandsInfo>> getByName(BrandsInfo brandsInfo) {
+		if (StrUtil.isBlank(brandsInfo.getBrandName())) {
+			Query query = new Query();
+			query.setCurrent(1);
+			query.setSize(50);
+			IPage<BrandsInfo> pages = brandsInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(brandsInfo));
+			return R.data(pages.getRecords());
+		}
+		if (NumberUtil.isNumber(brandsInfo.getBrandName()) && brandsInfo.getBrandName().length() == 19) {
+			BrandsInfo info = brandsInfoService.getById(brandsInfo.getBrandName());
+			if (info != null) {
+				List<BrandsInfo> brandsInfoList = new ArrayList<>();
+				brandsInfoList.add(info);
+				return R.data(brandsInfoList);
+			}
+		}
+		return R.data(brandsInfoService.lambdaQuery().eq(BrandsInfo::getId, brandsInfo.getBrandName())
+			.or().like(BrandsInfo::getBrandName, brandsInfo.getBrandName()).list());
+	}
+}

src/main/java/org/springblade/modules/mall/controller/CategoryInfoController.java

@@ -0,0 +1,260 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.node.TreeNode;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.service.ICategoryInfoService;
+import org.springblade.modules.mall.service.impl.GoodsInfoServiceImpl;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import org.springblade.modules.mall.wrapper.CategoryInfoWrapper;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 类别表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/categoryinfo")
+@Api(value = "类别表", tags = "类别表接口")
+public class CategoryInfoController extends BladeController {
+
+	private final ICategoryInfoService categoryInfoService;
+
+	@Resource
+	private GoodsInfoServiceImpl goodsInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入categoryInfo")
+	public R<CategoryInfoVO> detail(CategoryInfo categoryInfo) {
+		CategoryInfo detail = categoryInfoService.getOne(Condition.getQueryWrapper(categoryInfo));
+		List<Long> parentId = this.findParentId(categoryInfo.getId(), new ArrayList<>());
+		CategoryInfoVO categoryInfoVO = CategoryInfoWrapper.build().entityVO(detail);
+		categoryInfoVO.setParentIdArr(parentId);
+		return R.data(categoryInfoVO);
+	}
+
+	/**
+	 * 分页 类别表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入categoryInfo")
+	public R<IPage<CategoryInfoVO>> list(CategoryInfo categoryInfo, Query query) {
+		IPage<CategoryInfo> pages = categoryInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(categoryInfo));
+		return R.data(CategoryInfoWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 类别表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入categoryInfo")
+	public R<IPage<CategoryInfoVO>> page(CategoryInfoVO categoryInfo, Query query) {
+		IPage<CategoryInfoVO> pages = categoryInfoService.selectCategoryInfoPage(Condition.getPage(query), categoryInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 类别表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入categoryInfo")
+	public R save(@Valid @RequestBody CategoryInfo categoryInfo) {
+		if (categoryInfo.getParentId() == null) {
+			categoryInfo.setParentId(0L);
+		}
+		return R.status(categoryInfoService.save(categoryInfo));
+	}
+
+	/**
+	 * 修改 类别表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入categoryInfo")
+	public R update(@Valid @RequestBody CategoryInfo categoryInfo) {
+		return R.status(categoryInfoService.updateById(categoryInfo));
+	}
+
+	/**
+	 * 新增或修改 类别表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入categoryInfo")
+	public R submit(@Valid @RequestBody CategoryInfo categoryInfo) {
+		if (categoryInfo.getParentId() == null || categoryInfo.getParentId() == 0L ) {
+			categoryInfo.setParentId(0L);
+			categoryInfo.setLevel(0);
+		} else {
+			CategoryInfo parent = categoryInfoService.getById(categoryInfo.getParentId());
+			categoryInfo.setLevel(parent.getLevel() + 1);
+		}
+		if (categoryInfo.getId() == null) {
+			CategoryInfo category = categoryInfoService.getOne(Wrappers.lambdaQuery(CategoryInfo.class)
+				.eq(CategoryInfo::getTitle, categoryInfo.getTitle()).eq(CategoryInfo::getParentId, categoryInfo.getParentId()));
+			if (category != null) {
+				return R.fail("分类已存在");
+			}
+		}
+		return R.status(categoryInfoService.saveOrUpdate(categoryInfo));
+	}
+
+
+	/**
+	 * 删除 类别表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(categoryInfoService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 懒加载列表
+	 */
+	@GetMapping("/lazy-list")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "懒加载列表", notes = "传入Category")
+	public R<List<CategoryInfoVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
+		List<CategoryInfoVO> list = categoryInfoService.lazyList(parentId, menu);
+		return R.data(CategoryInfoWrapper.build().listNodeLazyVO(list));
+	}
+
+	/**
+	 * 懒加载列表
+	 */
+	@GetMapping("/getByParentId/{parentId}")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "根据父id查询")
+	public R<List<CategoryInfoVO>> getByParentId(@PathVariable("parentId") Long parentId) {
+		long l = System.currentTimeMillis();
+		List<CategoryInfo> categoryInfos = categoryInfoService.lambdaQuery().eq(CategoryInfo::getParentId, parentId).orderByAsc(CategoryInfo::getSort).list();
+		long l1 = System.currentTimeMillis();
+		System.out.println("query time: " + (l1 - l));
+		List<CategoryInfoVO> treeNodes = new ArrayList<>();
+		for (CategoryInfo categoryInfo : categoryInfos) {
+			CategoryInfoVO treeNode = new CategoryInfoVO();
+			treeNode.setTitle(categoryInfo.getTitle());
+			treeNode.setLevel(categoryInfo.getLevel());
+			treeNode.setState(categoryInfo.getState());
+			treeNode.setSort(categoryInfo.getSort());
+			treeNode.setParentId(categoryInfo.getParentId());
+			treeNode.setKey(categoryInfo.getId());
+			treeNode.setId(categoryInfo.getId());
+			treeNode.setHasChildren(!"2".equals(categoryInfo.getLevel()));
+			treeNodes.add(treeNode);
+		}
+		return R.data(treeNodes);
+	}
+
+	/**
+	 * 获取树形结构
+	 */
+	@GetMapping("/tree")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "树形结构", notes = "树形结构")
+	public R<List<TreeNode>> tree(@RequestParam(value = "flag", required = false) String flag) {
+		List<TreeNode> treeNodes = categoryInfoService.tree();
+		return R.data(treeNodes);
+	}
+
+
+	@PostMapping("/updateBatch")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "批量修改", notes = "传入ids")
+	public R updateBatch(@RequestParam String ids, @RequestParam Long parentId) {
+		List<Long> list = Func.toLongList(ids);
+		// 查询当前id的所有父id
+		List<Long> parentIds = this.findParentId(parentId, new ArrayList<>());
+		List<CategoryInfo> categoryInfos = categoryInfoService.lambdaQuery().in(CategoryInfo::getId, list).list();
+		Map<Long, CategoryInfo> categoryInfoMap = categoryInfos.stream().collect(Collectors.toMap(CategoryInfo::getId, Function.identity()));
+		for (Long id : list) {
+			List<Long> parentId1 = this.findParentId(id, new ArrayList<>());
+			String queryCId = parentId1.size() == 1 ? CollUtil.join(parentId1, "-") + "-" : CollUtil.join(parentId1, "-");
+
+			CategoryInfo categoryInfo = categoryInfoMap.get(id);
+			List<Long> longs = parentId1.subList(categoryInfo.getLevel(), parentId1.size());
+			List<Long> parentIdCopy = CollUtil.newArrayList(parentIds);
+			parentIdCopy.addAll(longs);
+
+			List<GoodsInfo> goodsInfos = goodsInfoService.lambdaQuery().likeRight(GoodsInfo::getGoodsCategoryId, queryCId).list();
+			for (GoodsInfo goodsInfo : goodsInfos) {
+				String newCategoryId = goodsInfo.getGoodsCategoryId().replace(CollUtil.join(parentId1, "-"), CollUtil.join(parentIdCopy, "-"));
+				goodsInfo.setGoodsCategoryId(newCategoryId + "-");
+			}
+			goodsInfoService.updateBatchById(goodsInfos);
+		}
+		for (Long a : list) {
+			if (!a.equals(parentId)) {
+				categoryInfoService.lambdaUpdate().set(CategoryInfo::getParentId, parentId).eq(CategoryInfo::getId, a).update();
+			}
+		}
+		return R.success("操作成功");
+	}
+
+	/**
+	 * 查询当前id的所有父id
+	 * @param parentId
+	 * @param idStr
+	 * @return
+	 */
+	private List<Long> findParentId(Long parentId, List<Long> idStr) {
+		CategoryInfo categoryInfo = categoryInfoService.getById(parentId);
+		if (categoryInfo.getParentId() == 0L) {
+			idStr.add(0, categoryInfo.getId());
+			return idStr;
+		}
+		idStr.add(0, categoryInfo.getId());
+		return this.findParentId(categoryInfo.getParentId(), idStr);
+	}
+}

src/main/java/org/springblade/modules/mall/controller/GoodsImgController.java

@@ -0,0 +1,128 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.GoodsImg;
+import org.springblade.modules.mall.service.IGoodsImgService;
+import org.springblade.modules.mall.vo.GoodsImgVO;
+import org.springblade.modules.mall.wrapper.GoodsImgWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 商品图片(视频) 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/goodsimg")
+@Api(value = "商品图片(视频)", tags = "商品图片(视频)接口")
+public class GoodsImgController extends BladeController {
+
+	private final IGoodsImgService goodsImgService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsImg")
+	public R<GoodsImgVO> detail(GoodsImg goodsImg) {
+		GoodsImg detail = goodsImgService.getOne(Condition.getQueryWrapper(goodsImg));
+		return R.data(GoodsImgWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 商品图片(视频)
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsImg")
+	public R<IPage<GoodsImgVO>> list(GoodsImg goodsImg, Query query) {
+		IPage<GoodsImg> pages = goodsImgService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsImg));
+		return R.data(GoodsImgWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 商品图片(视频)
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入goodsImg")
+	public R<IPage<GoodsImgVO>> page(GoodsImgVO goodsImg, Query query) {
+		IPage<GoodsImgVO> pages = goodsImgService.selectGoodsImgPage(Condition.getPage(query), goodsImg);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 商品图片(视频)
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsImg")
+	public R save(@Valid @RequestBody GoodsImg goodsImg) {
+		return R.status(goodsImgService.save(goodsImg));
+	}
+
+	/**
+	 * 修改 商品图片(视频)
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入goodsImg")
+	public R update(@Valid @RequestBody GoodsImg goodsImg) {
+		return R.status(goodsImgService.updateById(goodsImg));
+	}
+
+	/**
+	 * 新增或修改 商品图片(视频)
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入goodsImg")
+	public R submit(@Valid @RequestBody GoodsImg goodsImg) {
+		return R.status(goodsImgService.saveOrUpdate(goodsImg));
+	}
+
+	
+	/**
+	 * 删除 商品图片(视频)
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(goodsImgService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

src/main/java/org/springblade/modules/mall/controller/GoodsInfoController.java

@@ -0,0 +1,246 @@
+package org.springblade.modules.mall.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.common.enums.BusinessTypeEnum;
+import org.springblade.common.param.RangeParam;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.*;
+import org.springblade.modules.mall.service.*;
+import org.springblade.modules.mall.vo.GoodsInfoVO;
+import org.springblade.modules.mall.wrapper.GoodsInfoWrapper;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 商品表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/goodsinfo")
+@Api(value = "商品表", tags = "商品表接口")
+public class GoodsInfoController extends BladeController {
+
+	@Resource
+	private IGoodsInfoService goodsInfoService;
+	@Resource
+	private IGoodsImgService iGoodsImgService;
+	@Resource
+	private IGoodsSpecService goodsSpecService;
+	@Resource
+	private IGoodsParamsService goodsParamsService;
+	@Resource
+	private IBrandsInfoService brandsInfoService;
+	@Resource
+	private IActivitiesGoodsService activitiesGoodsService;
+
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsInfo")
+	public R<GoodsInfoVO> detail(GoodsInfo goodsInfo) {
+		GoodsInfo detail = goodsInfoService.detail(goodsInfo.getId());
+		return R.data(GoodsInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 商品表
+	 */
+	@PostMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsInfo")
+	public R<IPage<GoodsInfoVO>> list(@RequestBody GoodsInfo goodsInfo, @RequestBody Query query) {
+		QueryWrapper<GoodsInfo> queryWrapper = Condition.getQueryWrapper(goodsInfo);
+		if (StrUtil.isNotBlank(goodsInfo.getGoodsName())) {
+			queryWrapper.like("goods_name", goodsInfo.getGoodsName());
+			goodsInfo.setGoodsName(null);
+		}
+		if ("-1".equals(goodsInfo.getGoodsCategoryId())) {
+			queryWrapper.isNull("goods_category_id");
+			goodsInfo.setGoodsCategoryId(null);
+		}
+		if (StrUtil.isNotBlank(goodsInfo.getGoodsCategoryId())) {
+			queryWrapper.likeRight("goods_category_id", goodsInfo.getGoodsCategoryId() + "-");
+			goodsInfo.setGoodsCategoryId(null);
+		}
+		if (StrUtil.isNotBlank(goodsInfo.getCid())) {
+			queryWrapper.likeRight("goods_category_id", goodsInfo.getCid());
+			goodsInfo.setCid(null);
+		}
+		if (StrUtil.isNotBlank(goodsInfo.getDiscountRange())) {
+			String[] discountRanges = goodsInfo.getDiscountRange().split("-");
+			queryWrapper.and(i -> i.ge("discount", discountRanges[0]).le("discount", discountRanges[1]));
+			goodsInfo.setDiscountRange(null);
+		}
+		RangeParam promotionRateRange = goodsInfo.getPromotionRateRange();
+		if (promotionRateRange != null) {
+			if (StrUtil.isNotBlank(promotionRateRange.getFrom())) {
+				queryWrapper.ge("promotion_rate", promotionRateRange.getFrom());
+			}
+			if (StrUtil.isNotBlank(promotionRateRange.getTo())) {
+				queryWrapper.le("promotion_rate", promotionRateRange.getTo());
+			}
+		}
+		if (CollUtil.isNotEmpty(goodsInfo.getBrandIds())) {
+			queryWrapper.in("brand_id", goodsInfo.getBrandIds());
+		}
+		if (StrUtil.isNotBlank(goodsInfo.getActivityDate())) {
+			List<ActivitiesGoods> list = activitiesGoodsService.lambdaQuery().eq(ActivitiesGoods::getActivityDate, goodsInfo.getActivityDate()).select(ActivitiesGoods::getGoodsInfoId).list();
+			if (CollUtil.isNotEmpty(list)) {
+				List<Long> collect = list.stream().map(ActivitiesGoods::getGoodsInfoId).collect(Collectors.toList());
+				queryWrapper.in("id", collect);
+			} else {
+				IPage<GoodsInfoVO> page = new Page<>();
+				return R.data(page);
+			}
+		}
+		IPage<GoodsInfo> pages = goodsInfoService.page(Condition.getPage(query), queryWrapper);
+		IPage<GoodsInfoVO> goodsInfoVOIPage = GoodsInfoWrapper.build().pageVO(pages);
+		if (CollUtil.isNotEmpty(goodsInfoVOIPage.getRecords())) {
+			List<Long> collect = goodsInfoVOIPage.getRecords().stream().map(GoodsInfoVO::getBrandId).collect(Collectors.toList());
+			HashSet<Long> longs = CollUtil.newHashSet(collect);
+			List<BrandsInfo> list = brandsInfoService.lambdaQuery().in(BrandsInfo::getId, longs).list();
+			Map<Long, BrandsInfo> brandsInfoMap = list.stream().collect(Collectors.toMap(BrandsInfo::getId, Function.identity()));
+			for (GoodsInfoVO record : goodsInfoVOIPage.getRecords()) {
+				record.setBrandDesc(brandsInfoMap.get(record.getBrandId()).getBrandName());
+			}
+		}
+
+		return R.data(goodsInfoVOIPage);
+	}
+
+
+	/**
+	 * 自定义分页 商品表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入goodsInfo")
+	public R<IPage<GoodsInfoVO>> page(GoodsInfoVO goodsInfo, Query query) {
+		IPage<GoodsInfoVO> pages = goodsInfoService.selectGoodsInfoPage(Condition.getPage(query), goodsInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 商品表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsInfo")
+	public R save(@Valid @RequestBody GoodsInfo goodsInfo) {
+		return R.status(goodsInfoService.save(goodsInfo));
+	}
+
+	/**
+	 * 修改 商品表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入goodsInfo")
+	public R update(@Valid @RequestBody GoodsInfo goodsInfo) {
+		goodsInfoService.update(goodsInfo);
+		return R.success("ok");
+	}
+
+	/**
+	 * 新增或修改 商品表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入goodsInfo")
+	public R submit(@Valid @RequestBody GoodsInfo goodsInfo) {
+		GoodsInfo detail = goodsInfoService.getOne(Wrappers.lambdaQuery(GoodsInfo.class)
+			.eq(GoodsInfo::getGoodsName, goodsInfo.getGoodsName()).eq(GoodsInfo::getBrandId, goodsInfo.getBrandId()));
+		if (detail != null) {
+			return R.fail("商品已存在");
+		}
+		goodsInfoService.submit(goodsInfo);
+		return R.success("操作成功");
+	}
+
+
+	/**
+	 * 删除 商品表
+	 */
+	@Transactional(rollbackFor = Exception.class)
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		List<Long> longs = Func.toLongList(ids);
+		List<GoodsInfo> list = goodsInfoService.lambdaQuery().eq(GoodsInfo::getBusinessType, BusinessTypeEnum.NONE_SELF_SUPPORT.getValue()).in(GoodsInfo::getId, longs).list();
+		goodsInfoService.removeByIds(longs);
+		goodsSpecService.deleteByGoodsIds(longs);
+		goodsParamsService.deleteByGoodsIds(longs);
+		iGoodsImgService.deleteByGoodsIds(longs);
+		return R.success("操作成功");
+	}
+
+
+	@PostMapping("/modifyState")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "批量修改商品状态", notes = "传入ids")
+	public R modifyState(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
+						 @ApiParam(value = "state", required = true) @RequestParam Integer state) {
+		goodsInfoService.modifyState(Func.toLongList(ids), state);
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/modifyCategory")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "批量修改商品分类", notes = "传入ids")
+	public R modifyCategory(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
+						 @ApiParam(value = "categoryIds", required = true) @RequestParam String categoryIds) {
+		goodsInfoService.modifyCategory(Func.toLongList(ids), categoryIds);
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/modifyZoneType")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "批量修改专区类型", notes = "传入ids")
+	public R modifyZoneType(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
+							 @ApiParam(value = "zoneType", required = true) @RequestParam Integer zoneType,
+							@ApiParam(value = "activityDate") @RequestParam String activityDate) {
+		goodsInfoService.modifyZoneType(Func.toLongList(ids), zoneType, DateUtil.parse(activityDate, "yyyy-MM-dd"));
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/setActivityGoods")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "设置活动商品", notes = "传入ids")
+	public R setActivityGoods(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
+							@ApiParam(value = "activityDate") @RequestParam String activityDate) {
+		goodsInfoService.setActivityGoods(Func.toLongList(ids), DateUtil.parse(activityDate, "yyyy-MM-dd"));
+		return R.success("操作成功");
+	}
+}

src/main/java/org/springblade/modules/mall/controller/GoodsParamsController.java

@@ -0,0 +1,138 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.service.IGoodsParamsService;
+import org.springblade.modules.mall.vo.GoodsParamsVO;
+import org.springblade.modules.mall.wrapper.GoodsParamsWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 商品参数表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/goodsparams")
+@Api(value = "商品参数表", tags = "商品参数表接口")
+public class GoodsParamsController extends BladeController {
+
+	private final IGoodsParamsService goodsParamsService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsParams")
+	public R<GoodsParamsVO> detail(GoodsParams goodsParams) {
+		GoodsParams detail = goodsParamsService.getOne(Condition.getQueryWrapper(goodsParams));
+		return R.data(GoodsParamsWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 商品参数表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsParams")
+	public R<IPage<GoodsParamsVO>> list(GoodsParams goodsParams, Query query) {
+		IPage<GoodsParams> pages = goodsParamsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsParams));
+		return R.data(GoodsParamsWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 获取商品参数
+	 */
+	@GetMapping("/getByGoodsId")
+	@ApiOperationSupport(order = 2)
+	public R<List<GoodsParams>> getByGoodsId(GoodsParams goodsParams) {
+		return R.data(goodsParamsService.getByGoodsId(goodsParams.getGoodsId()));
+	}
+
+
+	/**
+	 * 自定义分页 商品参数表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入goodsParams")
+	public R<IPage<GoodsParamsVO>> page(GoodsParamsVO goodsParams, Query query) {
+		IPage<GoodsParamsVO> pages = goodsParamsService.selectGoodsParamsPage(Condition.getPage(query), goodsParams);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 商品参数表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsParams")
+	public R save(@Valid @RequestBody GoodsParams goodsParams) {
+		return R.status(goodsParamsService.save(goodsParams));
+	}
+
+	/**
+	 * 修改 商品参数表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入goodsParams")
+	public R update(@Valid @RequestBody GoodsParams goodsParams) {
+		return R.status(goodsParamsService.updateById(goodsParams));
+	}
+
+	/**
+	 * 新增或修改 商品参数表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入goodsParams")
+	public R submit(@Valid @RequestBody GoodsParams goodsParams) {
+		return R.status(goodsParamsService.saveOrUpdate(goodsParams));
+	}
+
+
+	/**
+	 * 删除 商品参数表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(goodsParamsService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/springblade/modules/mall/controller/GoodsSpecController.java

@@ -0,0 +1,205 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.common.enums.YesOrNoEnum;
+import org.springblade.common.enums.ZoneTypeEnum;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.service.IGoodsSpecService;
+import org.springblade.modules.mall.service.impl.GoodsInfoServiceImpl;
+import org.springblade.modules.mall.vo.GoodsSpecVO;
+import org.springblade.modules.mall.wrapper.GoodsSpecWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.math.BigDecimal;
+
+/**
+ * 商品规格表 控制器
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("mall/goodsspec")
+@Api(value = "商品规格表", tags = "商品规格表接口")
+public class GoodsSpecController extends BladeController {
+
+	@Resource
+	private IGoodsSpecService goodsSpecService;
+	@Resource
+	private GoodsInfoServiceImpl goodsInfoService;
+
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsSpec")
+	public R<GoodsSpecVO> detail(GoodsSpec goodsSpec) {
+		GoodsSpec detail = goodsSpecService.getOne(Condition.getQueryWrapper(goodsSpec));
+		if (detail == null) {
+			return R.fail("规格数据不存在，请刷新后重试");
+		}
+		GoodsInfo goodsInfo = goodsInfoService.getById(detail.getGoodsId());
+		if (goodsInfo == null) {
+			return R.fail("商品数据不存在，请刷新后重试");
+		}
+		detail.setGoodsNo(goodsInfo.getGoodsNo());
+		return R.data(GoodsSpecWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 商品规格表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsSpec")
+	public R<IPage<GoodsSpecVO>> list(GoodsSpec goodsSpec, Query query) {
+		IPage<GoodsSpecVO> goodsSpecVOIPage = goodsSpecService.selectGoodsSpecPage(Condition.getPage(query), goodsSpec);
+		return R.data(goodsSpecVOIPage);
+	}
+
+
+	/**
+	 * 自定义分页 商品规格表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入goodsSpec")
+	public R<IPage<GoodsSpecVO>> page(GoodsSpecVO goodsSpec, Query query) {
+		IPage<GoodsSpecVO> pages = goodsSpecService.selectGoodsSpecPage(Condition.getPage(query), goodsSpec);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 商品规格表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入goodsSpec")
+	public R save(@Valid @RequestBody GoodsSpec goodsSpec) {
+		if (YesOrNoEnum.YES.getValue().equals(goodsSpec.getIsPackage())) {
+			if (goodsSpec.getPackageNum() == null) {
+				return R.fail("套装数不能为空");
+			}
+			if (goodsSpec.getPackageNum() < 0) {
+				return R.fail("套装数不能小于0");
+			}
+		}
+		return R.status(goodsSpecService.save(goodsSpec));
+	}
+
+	/**
+	 * 修改 商品规格表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入goodsSpec")
+	public R update(@Valid @RequestBody GoodsSpec goodsSpec) {
+		if (YesOrNoEnum.YES.getValue().equals(goodsSpec.getIsPackage())) {
+			if (goodsSpec.getPackageNum() == null) {
+				return R.fail("套装数不能为空");
+			}
+			if (goodsSpec.getPackageNum() < 0) {
+				return R.fail("套装数不能小于0");
+			}
+		}
+		return R.status(goodsSpecService.updateById(goodsSpec));
+	}
+
+	/**
+	 * 新增或修改 商品规格表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入goodsSpec")
+	public R submit(@Valid @RequestBody GoodsSpec goodsSpec) {
+		if (YesOrNoEnum.YES.getValue().equals(goodsSpec.getIsPackage())) {
+			if (goodsSpec.getPackageNum() == null) {
+				return R.fail("套装数不能为空");
+			}
+			if (goodsSpec.getPackageNum() < 0) {
+				return R.fail("套装数不能小于0");
+			}
+		}
+		goodsSpecService.submit(goodsSpec);
+		return R.success("操作成功");
+	}
+
+
+	/**
+	 * 删除 商品规格表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(goodsSpecService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 上下架
+	 */
+	@PostMapping("/updateStatus")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "上下架", notes = "传入ids")
+	public R updateStatus(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+		goodsSpecService.updateStatus(id);
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/batchOnSale")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "批量上架", notes = "传入ids")
+	public R batchOnSale(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		goodsSpecService.batchOnSale(Func.toLongList(ids));
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/batchShelves")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "批量下架", notes = "传入ids")
+	public R batchShelves(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		goodsSpecService.batchShelves(Func.toLongList(ids));
+		return R.success("操作成功");
+	}
+
+	@PostMapping("/batchModifyPrice")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "批量修改价格", notes = "传入ids")
+	public R batchModifyPrice(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "主键集合", required = true) @RequestParam BigDecimal salePrice) {
+		goodsSpecService.batchModifyPrice(Func.toLongList(ids), salePrice);
+		return R.success("操作成功");
+	}
+}

src/main/java/org/springblade/modules/mall/dto/BrandsInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.BrandsInfo;
+
+/**
+ * 品牌信息表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BrandsInfoDTO extends BrandsInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/dto/CategoryInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.CategoryInfo;
+
+/**
+ * 类别表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CategoryInfoDTO extends CategoryInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/dto/GoodsImgDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsImg;
+
+/**
+ * 商品图片(视频)数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GoodsImgDTO extends GoodsImg {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/dto/GoodsInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsInfo;
+
+/**
+ * 商品表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GoodsInfoDTO extends GoodsInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/dto/GoodsParamsDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsParams;
+
+/**
+ * 商品参数表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GoodsParamsDTO extends GoodsParams {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/dto/GoodsSpecDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsSpec;
+
+/**
+ * 商品规格表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GoodsSpecDTO extends GoodsSpec {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/entity/ActivitiesGoods.java

@@ -0,0 +1,29 @@
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * Author pangqijun
+ * Date 2022/10/27
+ * Description
+ */
+@Data
+@TableName("biz_activities_goods")
+@ApiModel(value = "ActivitiesGoods对象", description = "活动商品表")
+public class ActivitiesGoods extends BaseEntity {
+	/** 商品id */
+	private Long goodsInfoId;
+	/** 活动名称 */
+	private String activityName;
+	/** 活动日期 */
+	private Date activityDate;
+	/** 活动开始时间 */
+	private Date startTime;
+	/** 活动结束时间 */
+	private Date endTime;
+}

src/main/java/org/springblade/modules/mall/entity/BrandsInfo.java

@@ -0,0 +1,74 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 品牌信息表实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@TableName("biz_brands_info")
+@ApiModel(value = "BrandsInfo对象", description = "品牌信息表")
+public class BrandsInfo extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	/**
+	 * 品牌图标
+	 */
+	@ApiModelProperty(value = "品牌图标")
+	private String logo;
+	/**
+	 * 品牌背景图片
+	 */
+	@ApiModelProperty(value = "品牌背景图片")
+	private String backgroundImage;
+	/**
+	 * 品牌介绍
+	 */
+	@ApiModelProperty(value = "品牌介绍")
+	private String brandDesc;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	 * 状态;1：有效；0：无效；
+	 */
+	@ApiModelProperty(value = "状态;1：有效；0：无效；")
+	private String state;
+	/**
+	 * is_delete;0为未删除，1为已删除
+	 */
+	@ApiModelProperty(value = "is_delete;0为未删除，1为已删除")
+	private Integer isDelete;
+}

src/main/java/org/springblade/modules/mall/entity/CategoryInfo.java

@@ -0,0 +1,75 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 类别表实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@TableName("biz_category_info")
+@ApiModel(value = "CategoryInfo对象", description = "类别表")
+public class CategoryInfo extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 分类名称
+	 */
+	@ApiModelProperty(value = "分类名称")
+	private String title;
+	/**
+	 * 分类图标
+	 */
+	@ApiModelProperty(value = "分类图标")
+	private String logo;
+	/**
+	 * 层级
+	 */
+	@ApiModelProperty(value = "0")
+	private Integer level;
+	/**
+	 * 状态;1：有效；0：无效；
+	 */
+	@ApiModelProperty(value = "状态;1：有效；0：无效；")
+	private Integer state;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	 * 分类父id
+	 */
+	@ApiModelProperty(value = "分类父id")
+	private Long parentId;
+}

src/main/java/org/springblade/modules/mall/entity/GoodsImg.java

@@ -0,0 +1,69 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springblade.common.base.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 商品图片(视频)实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("biz_goods_img")
+@ApiModel(value = "GoodsImg对象", description = "商品图片(视频)")
+public class GoodsImg extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 商品id
+	 */
+	@ApiModelProperty(value = "商品id")
+	private Long goodsId;
+	/**
+	 * 资源地址
+	 */
+	@ApiModelProperty(value = "资源地址")
+	private String url;
+	/**
+	 * 类型;1-轮播图 2-详情
+	 */
+	@ApiModelProperty(value = "类型;1-轮播图 2-详情")
+	private Integer type;
+	/**
+	 * 文件类型;1-图片 2-视频
+	 */
+	@ApiModelProperty(value = "文件类型;1-图片 2-视频")
+	private Integer fileType;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+}

src/main/java/org/springblade/modules/mall/entity/GoodsInfo.java

@@ -0,0 +1,280 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+import org.springblade.common.param.RangeParam;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商品表实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@TableName("biz_goods_info")
+@ApiModel(value = "GoodsInfo对象", description = "商品表")
+public class GoodsInfo extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 商品编号
+	 */
+	@ApiModelProperty(value = "商品编号")
+	private String goodsNo;
+	/**
+	 * 商品名称
+	 */
+	@ApiModelProperty(value = "商品名称")
+	private String goodsName;
+	/**
+	 * 商品封面
+	 */
+	@ApiModelProperty(value = "商品封面")
+	private String goodsCover;
+	/**
+	 * 商品标签
+	 */
+	@ApiModelProperty(value = "商品标签")
+	private String goodsLable;
+	/**
+	 * 产地
+	 */
+	@ApiModelProperty(value = "产地")
+	private String origin;
+	/**
+	 * 分类ID
+	 */
+	@ApiModelProperty(value = "分类ID，多个逗号分割")
+	private String goodsCategoryId;
+	/**
+	 * 品牌ID
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private Long brandId;
+	/**
+	 * 是否上架;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否上架;1-是  0-否")
+	private Integer isSale;
+	/**
+	 * 上架时间
+	 */
+	@ApiModelProperty(value = "上架时间")
+	private LocalDateTime saleTime;
+	/**
+	 * 是否推荐;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否推荐;1-是  0-否")
+	private Integer isRecom;
+	/**
+	 * 是否热销;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否热销;1-是  0-否")
+	private Integer isHot;
+	/**
+	 * 是否参加活动;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否参加活动;1-是  0-否")
+	private Integer isActivity;
+	/**
+	 * 是否新品;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否新品;1-是  0-否")
+	private Integer isNew;
+	/**
+	 * 是否包邮;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否包邮;1-是  0-否")
+	private Integer isFreeShipping;
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freePrice;
+	/**
+	 * 总库存
+	 */
+	@ApiModelProperty(value = "总库存")
+	private Integer totalStock;
+	/**
+	 * 总销量
+	 */
+	@ApiModelProperty(value = "总销量")
+	private Integer totalSales;
+	/**
+	 * 总浏览量
+	 */
+	@ApiModelProperty(value = "总浏览量")
+	private Integer totalViews;
+	/**
+	 * 单位
+	 */
+	@ApiModelProperty(value = "单位")
+	private String unit;
+	/**
+	 * 营业类型;1-自营 2-他营
+	 */
+	@ApiModelProperty(value = "营业类型;1-自营 2-他营")
+	private Integer businessType;
+
+	/**
+	 * 专区类型;1-绿色积分专区 2-积分兑换专区 3-红色积分专区
+	 */
+	@ApiModelProperty(value = "专区类型;1-绿色积分专区 2-积分兑换专区 3-红色积分专区")
+	private Integer zoneType;
+
+	/**
+	 * 是否为合伙人商品;1-是  0-否
+	 */
+	@ApiModelProperty(value = "是否为合伙人商品;1-是  0-否")
+	private Integer isPartner;
+	/**
+	 * 第三方商品ID
+	 */
+	@ApiModelProperty(value = "第三方商品ID")
+	private String thirdId;
+	/**
+	 * 第三方商品来源
+	 */
+	@ApiModelProperty(value = "第三方商品来源 1-胜天半子 2-唯品尚")
+	private String source;
+
+	/**
+	 * 市场价
+	 */
+	@ApiModelProperty(value = "市场价")
+	private BigDecimal marketPrice;
+	/**
+	 * 指导价
+	 */
+	@ApiModelProperty(value = "指导价")
+	private BigDecimal guidePrice;
+	/**
+	 * 协议价
+	 */
+	@ApiModelProperty(value = "协议价")
+	private BigDecimal agreementPrice;
+	/**
+	 * 营销价
+	 */
+	@ApiModelProperty(value = "营销价")
+	private BigDecimal activityPrice;
+	/**
+	 * 销售价
+	 */
+	@ApiModelProperty(value = "销售价")
+	private BigDecimal salePrice;
+	/**
+	 * 成本价
+	 */
+	@ApiModelProperty(value = "成本价")
+	private BigDecimal costPrice;
+
+	/**
+	 * 利润率
+	 */
+	@ApiModelProperty(value = "利润率")
+	private BigDecimal promotionRate;
+
+	/**
+	 * 营销利润率
+	 */
+	@ApiModelProperty(value = "营销利润率")
+	private BigDecimal activityRate;
+
+	/**
+	 * 是否为特殊商品 1-是 0-否
+	 */
+	@ApiModelProperty(value = "是否为特殊商品 1-是 0-否")
+	private Integer isSpecial;
+
+	/**
+	 * 红包比例
+	 */
+	@ApiModelProperty(value = "红包比例")
+	private BigDecimal redEnvRatio;
+
+	/**
+	 * 加速红包比例
+	 */
+	@ApiModelProperty(value = "加速红包比例")
+	private BigDecimal speedRatio;
+
+	/**
+	 * 间接加速红包比例
+	 */
+	@ApiModelProperty(value = "间接加速红包比例")
+	private BigDecimal twoSpeedRatio;
+
+	/**
+	 * 最近同步时间
+	 */
+	@ApiModelProperty(value = "最近同步时间")
+	private Date lastSyncTime;
+
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
+	@ApiModelProperty(value = "轮播图")
+	@TableField(exist = false)
+	private List<String> slideshowList;
+
+	@ApiModelProperty(value = "详情图片")
+	@TableField(exist = false)
+	private List<String> detailImgUrlList;
+
+	@ApiModelProperty(value = "视频地址")
+	@TableField(exist = false)
+	private String videoUrl;
+
+	@ApiModelProperty("折扣")
+	private Double discount;
+
+	@TableField(exist = false)
+	@ApiModelProperty("折扣")
+	private String discountRange;
+
+	@TableField(exist = false)
+	@ApiModelProperty("活动日期")
+	private String activityDate;
+
+	@TableField(exist = false)
+	private String cid;
+
+	@TableField(exist = false)
+	@ApiModelProperty("毛利率查询范围")
+	private RangeParam promotionRateRange;
+
+	@TableField(exist = false)
+	private List<Long> brandIds;
+}

src/main/java/org/springblade/modules/mall/entity/GoodsParams.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 商品参数表实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@TableName("biz_goods_params")
+@ApiModel(value = "GoodsParams对象", description = "商品参数表")
+public class GoodsParams extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 参数名
+	 */
+	@ApiModelProperty(value = "参数名")
+	private String paramName;
+	/**
+	 * 参数值
+	 */
+	@ApiModelProperty(value = "参数值")
+	private String paramValue;
+	/**
+	 * 商品id
+	 */
+	@ApiModelProperty(value = "商品id")
+	private Long goodsId;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+}

src/main/java/org/springblade/modules/mall/entity/GoodsSpec.java

@@ -0,0 +1,187 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.base.BaseEntity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品规格表实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@TableName("biz_goods_spec")
+@ApiModel(value = "GoodsSpec对象", description = "商品规格表")
+public class GoodsSpec extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 规格名称
+	 */
+	@ApiModelProperty(value = "规格名称")
+	private String spceName;
+	/**
+	 * 规格编号
+	 */
+	@ApiModelProperty(value = "规格编号")
+	private String spceNo;
+	/**
+	 * 商品id
+	 */
+	@ApiModelProperty(value = "商品id")
+	private Long goodsId;
+	/**
+	 * 封面
+	 */
+	@ApiModelProperty(value = "封面")
+	private String cover;
+	/**
+	 * 库存
+	 */
+	@ApiModelProperty(value = "库存")
+	private Integer stock;
+	/**
+	 * 销量
+	 */
+	@ApiModelProperty(value = "销量")
+	private Integer sale;
+	/**
+	 * 是否默认规格;1-是 0-否
+	 */
+	@ApiModelProperty(value = "是否默认规格;1-是 0-否")
+	private Integer isDefault;
+	/**
+	 * 市场价
+	 */
+	@ApiModelProperty(value = "市场价")
+	private BigDecimal marketPrice;
+	/**
+	 * 指导价
+	 */
+	@ApiModelProperty(value = "指导价")
+	private BigDecimal guidePrice;
+	/**
+	 * 协议价
+	 */
+	@ApiModelProperty(value = "协议价")
+	private BigDecimal agreementPrice;
+	/**
+	 * 营销价
+	 */
+	@ApiModelProperty(value = "营销价")
+	private BigDecimal activityPrice;
+	/**
+	 * 销售价
+	 */
+	@ApiModelProperty(value = "销售价")
+	private BigDecimal salePrice;
+	/**
+	 * 成本价
+	 */
+	@ApiModelProperty(value = "成本价")
+	private BigDecimal costPrice;
+	/**
+	 * 利润率
+	 */
+	@ApiModelProperty(value = "利润率")
+	private BigDecimal promotionRate;
+
+	/**
+	 * 营销利润率
+	 */
+	@ApiModelProperty(value = "营销利润率")
+	private BigDecimal activityRate;
+	/**
+	 * 是否能积分抵扣;-是  0-否
+	 */
+	@ApiModelProperty(value = "是否能积分抵扣;1-是  0-否")
+	private Integer isIntegralDeduction;
+	/**
+	 * 抵扣所需积分
+	 */
+	@ApiModelProperty(value = "抵扣所需积分")
+	private BigDecimal needIntegral;
+	/**
+	 * 购买时获得的积分数
+	 */
+	@ApiModelProperty(value = "购买时获得的积分数")
+	private BigDecimal obtainIntegral;
+	/**
+	 * 是否上架;0下架1上架
+	 */
+	@ApiModelProperty(value = "是否上架;0下架1上架")
+	private Integer isSale;
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
+	 * 利润百分比
+	 */
+	@ApiModelProperty(value = "利润百分比")
+	private BigDecimal rate;
+
+	/**
+	 * 第三方optionId
+	 */
+	@ApiModelProperty(value = "第三方optionId")
+	private String optionId;
+
+	/**
+	 * 是否为套装
+	 */
+	@ApiModelProperty(value = "是否为套装 1-是 0-否")
+	private Integer isPackage;
+
+	/**
+	 * 套装商品数量
+	 */
+	@ApiModelProperty(value = "套装商品数量")
+	private Integer packageNum;
+
+	@TableField(exist = false)
+	private String goodsNo;
+
+	@TableField(exist = false)
+	private Integer zoneType;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "是否可售")
+	private boolean canSale = true;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "积分兑换时需要扣除的金额")
+	private BigDecimal needAmount;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "积分兑换时需要扣除的金额")
+	private BigDecimal exchangeNeedIntegral;
+
+	@TableField(exist = false)
+	private BigDecimal greenIntegral;
+}

src/main/java/org/springblade/modules/mall/mapper/ActivitiesGoodsMapper.java

@@ -0,0 +1,32 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.modules.mall.entity.ActivitiesGoods;
+
+
+/**
+ * 活动商品表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+public interface ActivitiesGoodsMapper extends BaseMapper<ActivitiesGoods> {
+
+
+}

target/classes/org/springblade/modules/system/mapper/DataScopeMapper.xml → src/main/java/org/springblade/modules/mall/mapper/ActivitiesGoodsMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.system.mapper.DataScopeMapper">
+<mapper namespace="org.springblade.modules.mall.mapper.ActivitiesGoodsMapper">
+
+
 
 </mapper>

src/main/java/org/springblade/modules/mall/mapper/BrandsInfoMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.mall.entity.BrandsInfo;
+import org.springblade.modules.mall.vo.BrandsInfoVO;
+
+import java.util.List;
+
+/**
+ * 品牌信息表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+public interface BrandsInfoMapper extends BaseMapper<BrandsInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param brandsInfo
+	 * @return
+	 */
+	List<BrandsInfoVO> selectBrandsInfoPage(IPage page, BrandsInfoVO brandsInfo);
+
+}

src/main/java/org/springblade/modules/mall/mapper/BrandsInfoMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.BrandsInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="brandsInfoResultMap" type="org.springblade.modules.mall.entity.BrandsInfo">
+        <id column="id" property="id"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="logo" property="logo"/>
+        <result column="background_image" property="backgroundImage"/>
+        <result column="brand_desc" property="brandDesc"/>
+        <result column="sort" property="sort"/>
+        <result column="state" property="state"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+
+    <select id="selectBrandsInfoPage" resultMap="brandsInfoResultMap">
+        select * from re_brands_info where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/mall/mapper/CategoryInfoMapper.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tool.node.TreeNode;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类别表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface CategoryInfoMapper extends BaseMapper<CategoryInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param categoryInfo
+	 * @return
+	 */
+	List<CategoryInfoVO> selectCategoryInfoPage(IPage page, CategoryInfoVO categoryInfo);
+
+	/**
+	 * 懒加载列表
+	 *
+	 * @param parentId
+	 * @param param
+	 * @return
+	 */
+	List<CategoryInfoVO> lazyList(Long parentId, Map<String, Object> param);
+
+	/**
+	 * 树形结构
+	 *
+	 * @return
+	 */
+	List<TreeNode> tree();
+}

src/main/java/org/springblade/modules/mall/mapper/CategoryInfoMapper.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.CategoryInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="categoryInfoResultMap" type="org.springblade.modules.mall.entity.CategoryInfo">
+        <id column="id" property="id"/>
+        <result column="title" property="title"/>
+        <result column="level" property="level"/>
+        <result column="state" property="state"/>
+        <result column="sort" property="sort"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="title" property="title"/>
+        <result column="value" property="value"/>
+        <result column="key" property="key"/>
+    </resultMap>
+
+    <resultMap id="categoryVOResultMap" type="org.springblade.modules.mall.vo.CategoryInfoVO">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="title" property="title"/>
+        <result column="sort" property="sort"/>
+        <result column="state" property="state"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="has_children" property="hasChildren"/>
+    </resultMap>
+
+    <select id="selectCategoryInfoPage" resultMap="categoryInfoResultMap">
+        select * from re_category_info where is_delete = 0
+    </select>
+
+    <select id="lazyList" resultMap="categoryVOResultMap">
+        SELECT
+        c.*,
+        (
+        SELECT
+        CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END
+        FROM
+        re_category_info
+        WHERE
+        parent_id = c.id AND is_delete = 0
+        ) AS "has_children"
+        FROM
+        re_category_info c
+        WHERE c.is_delete = 0
+        <if test="param1!=null">
+            and c.parent_id = #{param1}
+        </if>
+        ORDER BY c.sort
+    </select>
+
+    <select id="tree" resultMap="treeNodeResultMap">
+        select id, parent_id, title , id as "value", id as "key" from re_category_info where is_delete = 0
+    </select>
+</mapper>

src/main/java/org/springblade/modules/mall/mapper/GoodsImgMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.mall.entity.GoodsImg;
+import org.springblade.modules.mall.vo.GoodsImgVO;
+
+import java.util.List;
+
+/**
+ * 商品图片(视频) Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+public interface GoodsImgMapper extends BaseMapper<GoodsImg> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsImg
+	 * @return
+	 */
+	List<GoodsImgVO> selectGoodsImgPage(IPage page, GoodsImgVO goodsImg);
+
+}

src/main/java/org/springblade/modules/mall/mapper/GoodsImgMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.GoodsImgMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="goodsImgResultMap" type="org.springblade.modules.mall.entity.GoodsImg">
+        <id column="id" property="id"/>
+        <result column="goods_id" property="goodsId"/>
+        <result column="url" property="url"/>
+        <result column="type" property="type"/>
+        <result column="file_type" property="fileType"/>
+        <result column="sort" property="sort"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+
+    <select id="selectGoodsImgPage" resultMap="goodsImgResultMap">
+        select * from re_goods_img where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/mall/mapper/GoodsInfoMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.vo.GoodsInfoVO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 商品表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface GoodsInfoMapper extends BaseMapper<GoodsInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsInfo
+	 * @return
+	 */
+	List<GoodsInfoVO> selectGoodsInfoPage(IPage page, GoodsInfoVO goodsInfo);
+
+	@Select("SELECT DISTINCT i.id FROM biz_goods_info i LEFT JOIN biz_goods_spec s on s.goods_id = i.id " +
+		"WHERE i.promotion_rate != s.promotion_rate and i.is_delete = 0 and s.option_id is not null and i.promotion_rate >= #{start} and i.promotion_rate < #{end} GROUP BY i.id")
+	List<Long> mySelect(@Param("start") Integer start, @Param("end") Integer end);
+
+	List<GoodsInfo> activityGoods(IPage page, String activityDate);
+
+	@Select("select * from biz_goods_info where id = #{id}")
+	GoodsInfo get(Serializable id);
+}

src/main/java/org/springblade/modules/mall/mapper/GoodsInfoMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.GoodsInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="goodsInfoResultMap" type="org.springblade.modules.mall.entity.GoodsInfo">
+        <id column="id" property="id"/>
+        <result column="goods_no" property="goodsNo"/>
+        <result column="goods_name" property="goodsName"/>
+        <result column="goods_cover" property="goodsCover"/>
+        <result column="goods_lable" property="goodsLable"/>
+        <result column="origin" property="origin"/>
+        <result column="goods_category_id" property="goodsCategoryId"/>
+        <result column="brand_id" property="brandId"/>
+        <result column="is_sale" property="isSale"/>
+        <result column="sale_time" property="saleTime"/>
+        <result column="is_recom" property="isRecom"/>
+        <result column="is_hot" property="isHot"/>
+        <result column="is_new" property="isNew"/>
+        <result column="is_free_shipping" property="isFreeShipping"/>
+        <result column="free_price" property="freePrice"/>
+        <result column="total_stock" property="totalStock"/>
+        <result column="total_sales" property="totalSales"/>
+        <result column="total_views" property="totalViews"/>
+        <result column="unit" property="unit"/>
+        <result column="business_type" property="businessType"/>
+        <result column="is_partner" property="isPartner"/>
+        <result column="third_id" property="thirdId"/>
+        <result column="source" property="source"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+
+    <select id="selectGoodsInfoPage" resultMap="goodsInfoResultMap">
+        select * from biz_goods_info where is_deleted = 0
+    </select>
+
+    <select id="activityGoods" resultType="org.springblade.modules.mall.entity.GoodsInfo">
+        SELECT gi.* FROM biz_activities_goods ag JOIN biz_goods_info gi on ag.goods_info_id = gi.id
+        WHERE gi.is_delete = 0 and gi.is_activity = 1 and gi.is_sale = 1 and ag.is_delete = 0
+        <if test="@cn.hutool.core.util.StrUtil@isNotBlank(activityDate)">
+            and ag.activity_date = #{activityDate}
+        </if>
+        ORDER BY gi.sort
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/mall/mapper/GoodsParamsMapper.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.vo.GoodsParamsVO;
+
+import java.util.List;
+
+/**
+ * 商品参数表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface GoodsParamsMapper extends BaseMapper<GoodsParams> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsParams
+	 * @return
+	 */
+	List<GoodsParamsVO> selectGoodsParamsPage(IPage page, GoodsParamsVO goodsParams);
+
+}

src/main/java/org/springblade/modules/mall/mapper/GoodsParamsMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.GoodsParamsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="goodsParamsResultMap" type="org.springblade.modules.mall.entity.GoodsParams">
+        <id column="id" property="id"/>
+        <result column="param_name" property="paramName"/>
+        <result column="param_value" property="paramValue"/>
+        <result column="goods_id" property="goodsId"/>
+        <result column="sort" property="sort"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+
+    <select id="selectGoodsParamsPage" resultMap="goodsParamsResultMap">
+        select * from biz_goods_params where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/mall/mapper/GoodsSpecMapper.java

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Select;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.vo.GoodsSpecVO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 商品规格表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface GoodsSpecMapper extends BaseMapper<GoodsSpec> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsSpec
+	 * @return
+	 */
+	List<GoodsSpecVO> selectGoodsSpecPage(IPage page, GoodsSpec goodsSpec);
+
+	@Select("select * from re_goods_spec where id = #{id}")
+	GoodsSpec get(Serializable id);
+
+}

src/main/java/org/springblade/modules/mall/mapper/GoodsSpecMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.mall.mapper.GoodsSpecMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="goodsSpecResultMap" type="org.springblade.modules.mall.vo.GoodsSpecVO">
+        <id column="id" property="id"/>
+        <result column="spce_name" property="spceName"/>
+        <result column="spce_no" property="spceNo"/>
+        <result column="goods_id" property="goodsId"/>
+        <result column="cover" property="cover"/>
+        <result column="stock" property="stock"/>
+        <result column="sale" property="sale"/>
+        <result column="is_default" property="isDefault"/>
+        <result column="market_price" property="marketPrice"/>
+        <result column="guide_price" property="guidePrice"/>
+        <result column="agreement_price" property="agreementPrice"/>
+        <result column="activity_price" property="activityPrice"/>
+        <result column="sale_price" property="salePrice"/>
+        <result column="cost_price" property="costPrice"/>
+        <result column="is_integral_deduction" property="isIntegralDeduction"/>
+        <result column="need_integral" property="needIntegral"/>
+        <result column="obtain_integral" property="obtainIntegral"/>
+        <result column="is_sale" property="isSale"/>
+        <result column="rate" property="rate"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="create_user_id" property="createUserId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user_id" property="updateUserId"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="goods_no" property="goodsNo"/>
+        <result column="zone_type" property="zoneType"/>
+    </resultMap>
+
+
+    <select id="selectGoodsSpecPage" resultMap="goodsSpecResultMap">
+        select i.goods_no, i.zone_type, s.* FROM biz_goods_info i LEFT JOIN biz_goods_spec s on i.id = s.goods_id
+        WHERE i.is_delete = 0 and s.is_delete = 0
+        <if test="goodsSpec.goodsId != null" >
+            and i.id = #{goodsSpec.goodsId}
+        </if>
+        <if test="goodsSpec.zoneType != null" >
+            and i.zone_type = #{goodsSpec.zoneType}
+        </if>
+        <if test="goodsSpec.goodsNo != null" >
+            and i.goods_no = #{goodsSpec.goodsNo}
+        </if>
+        <if test="goodsSpec.spceNo != null" >
+            and s.spce_no = #{goodsSpec.spceNo}
+        </if>
+        <if test="goodsSpec.spceName != null" >
+            and INSTR(s.spce_name, #{goodsSpec.spceName})
+        </if>
+        ORDER BY i.create_time desc
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/mall/param/ImportCheckParam.java

@@ -0,0 +1,15 @@
+package org.springblade.modules.mall.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Author pangqijun
+ * Date 2022/8/2
+ * Description
+ */
+@Data
+public class ImportCheckParam {
+	private List<String> brandNames;
+}

src/main/java/org/springblade/modules/mall/service/IActivitiesGoodsService.java

@@ -0,0 +1,12 @@
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.mall.entity.ActivitiesGoods;
+
+/**
+ * Author pangqijun
+ * Date 2022/10/27
+ * Description
+ */
+public interface IActivitiesGoodsService extends IService<ActivitiesGoods> {
+}

src/main/java/org/springblade/modules/mall/service/IBrandsInfoService.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.mall.entity.BrandsInfo;
+import org.springblade.modules.mall.vo.BrandsInfoVO;
+
+/**
+ * 品牌信息表 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+public interface IBrandsInfoService extends IService<BrandsInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param brandsInfo
+	 * @return
+	 */
+	IPage<BrandsInfoVO> selectBrandsInfoPage(IPage<BrandsInfoVO> page, BrandsInfoVO brandsInfo);
+
+	BrandsInfo getByName(String name);
+}

src/main/java/org/springblade/modules/mall/service/ICategoryInfoService.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.tool.node.TreeNode;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类别表 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface ICategoryInfoService extends IService<CategoryInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param categoryInfo
+	 * @return
+	 */
+	IPage<CategoryInfoVO> selectCategoryInfoPage(IPage<CategoryInfoVO> page, CategoryInfoVO categoryInfo);
+
+	/**
+	 * 懒加载列表
+	 *
+	 * @param parentId
+	 * @param param
+	 * @return
+	 */
+	List<CategoryInfoVO> lazyList(Long parentId, Map<String, Object> param);
+
+	/**
+	 * 树形结构
+	 *
+	 * @return
+	 */
+	List<TreeNode> tree();
+
+	/**
+	 * 根据分类名称和层级查询
+	 * @param name
+	 * @param level
+	 * @return
+	 */
+	CategoryInfo getByNameAndLevel(String name, String level);
+}

src/main/java/org/springblade/modules/mall/service/IGoodsImgService.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.mall.entity.GoodsImg;
+import org.springblade.modules.mall.vo.GoodsImgVO;
+
+import java.util.List;
+
+/**
+ * 商品图片(视频) 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+public interface IGoodsImgService extends IService<GoodsImg> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsImg
+	 * @return
+	 */
+	IPage<GoodsImgVO> selectGoodsImgPage(IPage<GoodsImgVO> page, GoodsImgVO goodsImg);
+
+	void deleteByGoodsIds(List<Long> goodsIds);
+}

src/main/java/org/springblade/modules/mall/service/IGoodsInfoService.java

@@ -0,0 +1,78 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.common.enums.GoodsSourceEnum;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.vo.GoodsInfoVO;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商品表 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface IGoodsInfoService extends IService<GoodsInfo> {
+
+
+	GoodsInfo get(Serializable id);
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsInfo
+	 * @return
+	 */
+	IPage<GoodsInfoVO> selectGoodsInfoPage(IPage<GoodsInfoVO> page, GoodsInfoVO goodsInfo);
+
+	void submit(@Valid GoodsInfo goodsInfo);
+
+	void update(@Valid GoodsInfo goodsInfo);
+
+	GoodsInfo detail(Long id);
+
+	GoodsInfo getByGoodsNo(String goodsNo);
+
+	List<GoodsInfo> getByThirdIds(List<String> thirdIds, GoodsSourceEnum goodsSourceEnum);
+
+	void modifyState(List<Long> toLongList, Integer state);
+
+	void modifyCategory(List<Long> toLongList, String categoryIds);
+
+
+
+	/**
+	 * 修改专区类型
+	 * @param ids 商品id集合
+	 * @param zoneType 专区类型
+	 * @param activityDate
+	 */
+    void modifyZoneType(List<Long> ids, Integer zoneType, Date activityDate);
+
+	List<GoodsInfo> activityGoods(IPage<Object> page, String activityDate);
+
+	void setActivityGoods(List<Long> toLongList, DateTime parse);
+}

src/main/java/org/springblade/modules/mall/service/IGoodsParamsService.java

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.vo.GoodsParamsVO;
+
+import java.util.List;
+
+/**
+ * 商品参数表 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface IGoodsParamsService extends IService<GoodsParams> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsParams
+	 * @return
+	 */
+	IPage<GoodsParamsVO> selectGoodsParamsPage(IPage<GoodsParamsVO> page, GoodsParamsVO goodsParams);
+
+	void deleteByGoodsIds(List<Long> goodsIds);
+
+	List<GoodsParams> getByGoodsId(Long goodsId);
+}

src/main/java/org/springblade/modules/mall/service/IGoodsSpecService.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.vo.GoodsSpecVO;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 商品规格表 服务类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+public interface IGoodsSpecService extends IService<GoodsSpec> {
+
+
+	/**
+	 * 根据id获取规格
+	 * @param id
+	 * @return
+	 */
+	GoodsSpec get(Serializable id);
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param goodsSpec
+	 * @return
+	 */
+	IPage<GoodsSpecVO> selectGoodsSpecPage(IPage<GoodsSpecVO> page, GoodsSpec goodsSpec);
+
+    void submit(GoodsSpec goodsSpec);
+
+    void deleteByGoodsIds(List<Long> goodsIds);
+
+    List<GoodsSpec> getByGoodsId(Long goodsId);
+
+	void updateStatus(Long id);
+
+	void batchOnSale(List<Long> specIds);
+
+	void batchShelves(List<Long> specIds);
+
+	void batchModifyPrice(List<Long> specIds, BigDecimal salePrice);
+}

src/main/java/org/springblade/modules/mall/service/impl/BrandsInfoServiceImpl.java

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.mall.entity.BrandsInfo;
+import org.springblade.modules.mall.mapper.BrandsInfoMapper;
+import org.springblade.modules.mall.service.IBrandsInfoService;
+import org.springblade.modules.mall.vo.BrandsInfoVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 品牌信息表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Service
+public class BrandsInfoServiceImpl extends ServiceImpl<BrandsInfoMapper, BrandsInfo> implements IBrandsInfoService {
+
+	@Override
+	public IPage<BrandsInfoVO> selectBrandsInfoPage(IPage<BrandsInfoVO> page, BrandsInfoVO brandsInfo) {
+		return page.setRecords(baseMapper.selectBrandsInfoPage(page, brandsInfo));
+	}
+
+	@Override
+	public BrandsInfo getByName(String name) {
+		return this.getOne(Wrappers.lambdaQuery(BrandsInfo.class).eq(BrandsInfo::getBrandName, name));
+	}
+
+
+}

src/main/java/org/springblade/modules/mall/service/impl/CategoryInfoServiceImpl.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.node.ForestNodeMerger;
+import org.springblade.core.tool.node.TreeNode;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.mall.entity.CategoryInfo;
+import org.springblade.modules.mall.mapper.CategoryInfoMapper;
+import org.springblade.modules.mall.service.ICategoryInfoService;
+import org.springblade.modules.mall.vo.CategoryInfoVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类别表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Service
+public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper, CategoryInfo> implements ICategoryInfoService {
+
+	private final static String PARENT_ID = "parentId";
+
+	@Override
+	public IPage<CategoryInfoVO> selectCategoryInfoPage(IPage<CategoryInfoVO> page, CategoryInfoVO categoryInfo) {
+		return page.setRecords(baseMapper.selectCategoryInfoPage(page, categoryInfo));
+	}
+
+	@Override
+	public List<CategoryInfoVO> lazyList(Long parentId, Map<String, Object> param) {
+		if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
+			parentId = null;
+		}
+		return baseMapper.lazyList(parentId, param);
+	}
+
+	@Override
+	public List<TreeNode> tree() {
+		return ForestNodeMerger.merge(baseMapper.tree());
+	}
+
+	@Override
+	public CategoryInfo getByNameAndLevel(String name, String level) {
+		return this.baseMapper.selectOne(Wrappers.lambdaQuery(CategoryInfo.class).eq(CategoryInfo::getTitle, name).eq(CategoryInfo::getLevel, level));
+	}
+
+}

src/main/java/org/springblade/modules/mall/service/impl/GoodsImgServiceImpl.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.mall.entity.GoodsImg;
+import org.springblade.modules.mall.mapper.GoodsImgMapper;
+import org.springblade.modules.mall.service.IGoodsImgService;
+import org.springblade.modules.mall.vo.GoodsImgVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商品图片(视频) 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Service
+public class GoodsImgServiceImpl extends ServiceImpl<GoodsImgMapper, GoodsImg> implements IGoodsImgService {
+
+	@Override
+	public IPage<GoodsImgVO> selectGoodsImgPage(IPage<GoodsImgVO> page, GoodsImgVO goodsImg) {
+		return page.setRecords(baseMapper.selectGoodsImgPage(page, goodsImg));
+	}
+
+	@Override
+	public void deleteByGoodsIds(List<Long> goodsIds) {
+		baseMapper.delete(Wrappers.lambdaQuery(GoodsImg.class).in(GoodsImg::getGoodsId, goodsIds));
+	}
+
+}

src/main/java/org/springblade/modules/mall/service/impl/GoodsInfoServiceImpl.java

@@ -0,0 +1,314 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.enums.GoodsSourceEnum;
+import org.springblade.common.enums.YesOrNoEnum;
+import org.springblade.common.enums.ZoneTypeEnum;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.modules.mall.entity.ActivitiesGoods;
+import org.springblade.modules.mall.entity.GoodsImg;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.mapper.GoodsInfoMapper;
+import org.springblade.modules.mall.service.IActivitiesGoodsService;
+import org.springblade.modules.mall.service.IGoodsInfoService;
+import org.springblade.modules.mall.vo.GoodsInfoVO;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicLong;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * 商品表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Slf4j
+@Service
+public class GoodsInfoServiceImpl extends ServiceImpl<GoodsInfoMapper, GoodsInfo> implements IGoodsInfoService {
+
+	@Resource
+	private GoodsImgServiceImpl goodsImgService;
+	@Resource
+	private RedisTemplate redisTemplate;
+	@Resource
+	private GoodsSpecServiceImpl goodsSpecService;
+	@Resource
+	private IActivitiesGoodsService activitiesGoodsService;
+
+	private final static String GOODS_NO_PREFIX = "re:goods:info:no";
+
+	@Override
+	public GoodsInfo get(Serializable id) {
+		return this.baseMapper.get(id);
+	}
+
+	@Override
+	public IPage<GoodsInfoVO> selectGoodsInfoPage(IPage<GoodsInfoVO> page, GoodsInfoVO goodsInfo) {
+		return page.setRecords(baseMapper.selectGoodsInfoPage(page, goodsInfo));
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void update(@Valid GoodsInfo goodsInfo) {
+		GoodsInfo record = this.getById(goodsInfo.getId());
+		Assert.notNull(record, "商品信息不存在");
+		this.updateById(goodsInfo);
+
+		// 删除老的图片数据
+		LambdaQueryWrapper<GoodsImg> wrapper = Wrappers.lambdaQuery(GoodsImg.class).eq(GoodsImg::getGoodsId, goodsInfo.getId());
+		List<GoodsImg> list = goodsImgService.list(wrapper);
+		if (CollUtil.isNotEmpty(list)) {
+			goodsImgService.remove(wrapper);
+		}
+
+		// 保存商品图片数据
+		List<GoodsImg> goodsImgList = new ArrayList<>();
+		List<String> detailImgUrlList = goodsInfo.getDetailImgUrlList();
+		if (CollUtil.isNotEmpty(detailImgUrlList)) {
+			for (int i = 0; i < detailImgUrlList.size(); i++) {
+				String url = detailImgUrlList.get(i);
+				goodsImgList.add(new GoodsImg(goodsInfo.getId(), url, 2, 1, i + 1));
+			}
+		}
+		List<String> slideshowList = goodsInfo.getSlideshowList();
+		if (StrUtil.isNotBlank(goodsInfo.getVideoUrl())) {
+			goodsImgList.add(new GoodsImg(goodsInfo.getId(), goodsInfo.getVideoUrl(), 1, 2, 1));
+		}
+		if (CollUtil.isNotEmpty(slideshowList)) {
+			for (int i = 0; i < slideshowList.size(); i++) {
+				String url = slideshowList.get(i);
+				goodsImgList.add(new GoodsImg(goodsInfo.getId(), url, 1, 1, i + 2));
+			}
+		}
+		if (CollUtil.isNotEmpty(goodsImgList)) {
+			goodsImgService.saveBatch(goodsImgList);
+		}
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void submit(@Valid GoodsInfo goodsInfo) {
+		goodsInfo.setId(null);
+		goodsInfo.setGoodsNo(generateGoodsNo());
+		this.save(goodsInfo);
+		// 保存商品图片数据
+		List<GoodsImg> goodsImgList = new ArrayList<>();
+		List<String> detailImgUrlList = goodsInfo.getDetailImgUrlList();
+		if (CollUtil.isNotEmpty(detailImgUrlList)) {
+			for (int i = 0; i < detailImgUrlList.size(); i++) {
+				String url = detailImgUrlList.get(i);
+				goodsImgList.add(new GoodsImg(goodsInfo.getId(), url, 2, 1, i + 1));
+			}
+		}
+		List<String> slideshowList = goodsInfo.getSlideshowList();
+		if (StrUtil.isNotBlank(goodsInfo.getVideoUrl())) {
+			goodsImgList.add(new GoodsImg(goodsInfo.getId(), goodsInfo.getVideoUrl(), 1, 2, 1));
+		}
+		if (CollUtil.isNotEmpty(slideshowList)) {
+			for (int i = 0; i < slideshowList.size(); i++) {
+				String url = slideshowList.get(i);
+				goodsImgList.add(new GoodsImg(goodsInfo.getId(), url, 1, 1, i + 2));
+			}
+		}
+		if (CollUtil.isNotEmpty(goodsImgList)) {
+			goodsImgService.saveBatch(goodsImgList);
+		}
+	}
+
+	@Override
+	public GoodsInfo detail(Long id) {
+		GoodsInfo detail = this.getById(id);
+		List<GoodsImg> list = goodsImgService.list(Wrappers.lambdaQuery(GoodsImg.class).eq(GoodsImg::getGoodsId, detail.getId()));
+		if (CollUtil.isNotEmpty(list)) {
+			List<String> slideshowList = new ArrayList<>();
+			List<String> detailImgUrlList = new ArrayList<>();
+			for (GoodsImg goodsImg : list) {
+				if (goodsImg.getFileType() == 2) {
+					detail.setVideoUrl(goodsImg.getUrl());
+					continue;
+				}
+				if (goodsImg.getType() == 1) {
+					slideshowList.add(goodsImg.getUrl());
+				} else {
+					detailImgUrlList.add(goodsImg.getUrl());
+				}
+			}
+			detail.setDetailImgUrlList(detailImgUrlList);
+			detail.setSlideshowList(slideshowList);
+		}
+		return detail;
+	}
+
+	@Override
+	public GoodsInfo getByGoodsNo(String goodsNo) {
+		return this.getOne(Wrappers.lambdaQuery(GoodsInfo.class).eq(GoodsInfo::getGoodsNo, goodsNo));
+	}
+
+	@Override
+	public List<GoodsInfo> getByThirdIds(List<String> thirdIds, GoodsSourceEnum goodsSourceEnum) {
+		if (CollUtil.isNotEmpty(thirdIds)) {
+			return this.getBaseMapper().selectList(Wrappers.lambdaQuery(GoodsInfo.class).in(GoodsInfo::getThirdId, thirdIds).eq(GoodsInfo::getSource, goodsSourceEnum.getValue()));
+		}
+		return new ArrayList<>();
+	}
+
+	@Override
+	public void modifyState(List<Long> ids, Integer state) {
+		List<GoodsInfo> goodsInfos = this.getBaseMapper().selectList(Wrappers.lambdaQuery(GoodsInfo.class).in(GoodsInfo::getId, ids));
+		if (CollUtil.isNotEmpty(goodsInfos)) {
+			List<GoodsInfo> updateList = new ArrayList<>();
+			for (GoodsInfo goodsInfo : goodsInfos) {
+				GoodsInfo update = new GoodsInfo();
+				update.setId(goodsInfo.getId());
+				update.setIsSale(state);
+				updateList.add(update);
+			}
+			this.updateBatchById(updateList);
+		}
+	}
+
+	@Override
+	public void modifyCategory(List<Long> ids, String categoryIds) {
+		List<GoodsInfo> goodsInfos = this.getBaseMapper().selectList(Wrappers.lambdaQuery(GoodsInfo.class).in(GoodsInfo::getId, ids));
+		if (CollUtil.isNotEmpty(goodsInfos)) {
+			List<GoodsInfo> updateList = new ArrayList<>();
+			for (GoodsInfo goodsInfo : goodsInfos) {
+				GoodsInfo update = new GoodsInfo();
+				update.setId(goodsInfo.getId());
+				update.setGoodsCategoryId(categoryIds + "-");
+				updateList.add(update);
+			}
+			this.updateBatchById(updateList);
+		}
+	}
+
+
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void modifyZoneType(List<Long> ids, Integer zoneType, Date activityDate) {
+		List<GoodsInfo> goodsInfos = this.getBaseMapper().selectList(Wrappers.lambdaQuery(GoodsInfo.class).in(GoodsInfo::getId, ids));
+		if (CollUtil.isNotEmpty(goodsInfos)) {
+			for (GoodsInfo goodsInfo : goodsInfos) {
+				goodsInfo.setZoneType(zoneType);
+				this.updateById(goodsInfo);
+			}
+		}
+		if (ZoneTypeEnum.GREEN_INTEGRAL.getValue().equals(zoneType)) {
+			for (GoodsInfo goodsInfo : goodsInfos) {
+				List<GoodsSpec> specList = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsInfo.getId()).list();
+				for (GoodsSpec goodsSpec : specList) {
+					goodsSpec.setObtainIntegral(goodsSpec.getSalePrice());
+				}
+				goodsSpecService.updateBatchById(specList);
+			}
+		}
+	}
+
+
+	@Override
+	public List<GoodsInfo> activityGoods(IPage<Object> page, String activityDate) {
+		return this.baseMapper.activityGoods(page, activityDate);
+	}
+
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public void setActivityGoods(List<Long> ids, DateTime activityDate) {
+		List<GoodsInfo> goodsInfos = this.getBaseMapper().selectList(Wrappers.lambdaQuery(GoodsInfo.class).in(GoodsInfo::getId, ids));
+		List<ActivitiesGoods> list = new ArrayList<>();
+		for (GoodsInfo goodsInfo : goodsInfos) {
+			if (ZoneTypeEnum.CITY_PARTNER.getValue().equals(goodsInfo.getZoneType()) || ZoneTypeEnum.GREEN_INTEGRAL.getValue().equals(goodsInfo.getZoneType()) || ZoneTypeEnum.INTEGRAL_CONVERT.getValue().equals(goodsInfo.getZoneType())) {
+				throw new ServiceException("积分兑换专区、绿色积分专区、城市合伙人专区的商品暂不支持添加到活动中");
+			}
+			ActivitiesGoods record = activitiesGoodsService.lambdaQuery().eq(ActivitiesGoods::getGoodsInfoId, goodsInfo.getId()).one();
+			if (record != null && !record.getActivityDate().equals(activityDate)) {
+				activitiesGoodsService.removeById(record.getId());
+				ActivitiesGoods activitiesGoods = new ActivitiesGoods();
+				activitiesGoods.setGoodsInfoId(goodsInfo.getId());
+				activitiesGoods.setActivityDate(activityDate);
+				activitiesGoods.setStartTime(DateUtil.beginOfDay(activityDate));
+				activitiesGoods.setEndTime(DateUtil.endOfDay(activityDate).offset(DateField.MILLISECOND, -999));
+				list.add(activitiesGoods);
+			}
+			if (record == null){
+				ActivitiesGoods activitiesGoods = new ActivitiesGoods();
+				activitiesGoods.setGoodsInfoId(goodsInfo.getId());
+				activitiesGoods.setActivityDate(activityDate);
+				activitiesGoods.setStartTime(DateUtil.beginOfDay(activityDate));
+				activitiesGoods.setEndTime(DateUtil.endOfDay(activityDate).offset(DateField.MILLISECOND, -999));
+				list.add(activitiesGoods);
+			}
+		}
+		activitiesGoodsService.saveBatch(list);
+		this.lambdaUpdate().set(GoodsInfo::getIsActivity, YesOrNoEnum.YES.getValue()).in(GoodsInfo::getId, ids).update();
+	}
+
+
+	/**
+	 * 去除重复数据
+	 * @param specList
+	 */
+	private List<GoodsSpec> removeDuplication(List<GoodsSpec> specList) {
+		if (CollUtil.isEmpty(specList)) {
+			return specList;
+		}
+		Map<String, GoodsSpec> map = new HashMap<>();
+		for (GoodsSpec goodsSpec : specList) {
+			GoodsSpec spec = map.get(goodsSpec.getOptionId());
+			if (spec == null) {
+				map.put(goodsSpec.getOptionId(), goodsSpec);
+			} else {
+				if (spec.getId() != null) {
+					goodsSpecService.removeById(goodsSpec.getId());
+				}
+			}
+		}
+		return new ArrayList<>(map.values());
+	}
+
+
+
+	/**
+	 * 使用redis生成商品编号
+	 * @return
+	 */
+	private String generateGoodsNo() {
+		RedisAtomicLong redisAtomicLong = new RedisAtomicLong(GOODS_NO_PREFIX, redisTemplate.getConnectionFactory());
+		long seq = redisAtomicLong.incrementAndGet();
+		return "1" + String.format("%07d", seq);
+	}
+
+}

src/main/java/org/springblade/modules/mall/service/impl/GoodsParamsServiceImpl.java

@@ -0,0 +1,56 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.mapper.GoodsParamsMapper;
+import org.springblade.modules.mall.service.IGoodsParamsService;
+import org.springblade.modules.mall.vo.GoodsParamsVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商品参数表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Service
+public class GoodsParamsServiceImpl extends ServiceImpl<GoodsParamsMapper, GoodsParams> implements IGoodsParamsService {
+
+	@Override
+	public IPage<GoodsParamsVO> selectGoodsParamsPage(IPage<GoodsParamsVO> page, GoodsParamsVO goodsParams) {
+		return page.setRecords(baseMapper.selectGoodsParamsPage(page, goodsParams));
+	}
+
+	@Override
+	public void deleteByGoodsIds(List<Long> goodsIds) {
+		baseMapper.delete(Wrappers.lambdaQuery(GoodsParams.class).in(GoodsParams::getGoodsId, goodsIds));
+	}
+
+	@Override
+	public List<GoodsParams> getByGoodsId(Long goodsId) {
+		List<GoodsParams> list = this.list(Wrappers.lambdaQuery(GoodsParams.class).
+			eq(GoodsParams::getGoodsId, goodsId).orderByAsc(GoodsParams::getSort));
+		return list;
+	}
+
+}

src/main/java/org/springblade/modules/mall/service/impl/GoodsSpecServiceImpl.java

@@ -0,0 +1,153 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.enums.GoodsStateEnum;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.entity.GoodsSpec;
+import org.springblade.modules.mall.mapper.GoodsSpecMapper;
+import org.springblade.modules.mall.service.IGoodsSpecService;
+import org.springblade.modules.mall.vo.GoodsSpecVO;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicLong;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 商品规格表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Service
+public class GoodsSpecServiceImpl extends ServiceImpl<GoodsSpecMapper, GoodsSpec> implements IGoodsSpecService {
+
+	private final static String GOODS_SPEC_NO_PREFIX = "re:goods:spec:no";
+
+	@Resource
+	private GoodsInfoServiceImpl goodsInfoService;
+	@Resource
+	private RedisTemplate redisTemplate;
+
+	@Override
+	public GoodsSpec get(Serializable id) {
+		return this.baseMapper.get(id);
+	}
+
+	@Override
+	public IPage<GoodsSpecVO> selectGoodsSpecPage(IPage<GoodsSpecVO> page, GoodsSpec goodsSpec) {
+		return page.setRecords(baseMapper.selectGoodsSpecPage(page, goodsSpec));
+	}
+
+
+	@Override
+	public void submit(GoodsSpec goodsSpec) {
+		if (goodsSpec.getId() == null) {
+			GoodsInfo goodsInfo = goodsInfoService.get(goodsSpec.getGoodsId());
+			if (goodsInfo == null) {
+				throw new ServiceException("商品信息不存在");
+			}
+			goodsSpec.setGoodsId(goodsInfo.getId());
+			goodsSpec.setSpceNo(generateGoodsSpecNo());
+			// 商品添加的第一个规格设置成默认规格
+			Integer count = baseMapper.selectCount(Wrappers.lambdaQuery(GoodsSpec.class).eq(GoodsSpec::getGoodsId, goodsInfo.getId()));
+			if (count == 0) {
+				goodsSpec.setIsDefault(1);
+			} else {
+				if (goodsSpec.getIsDefault() == 1) {
+					this.update(Wrappers.lambdaUpdate(GoodsSpec.class).set(GoodsSpec::getIsDefault, 0).eq(GoodsSpec::getGoodsId, goodsInfo.getId()));
+				}
+			}
+		} else {
+			GoodsSpec spec = baseMapper.selectOne(Wrappers.lambdaQuery(GoodsSpec.class).eq(GoodsSpec::getGoodsId, goodsSpec.getGoodsId()).eq(GoodsSpec::getIsDefault, 1));
+			if (!spec.getId().equals(goodsSpec.getId()) && goodsSpec.getIsDefault() == 1) {
+				spec.setIsDefault(0);
+				baseMapper.updateById(spec);
+			}
+			if (spec.getId().equals(goodsSpec.getId()) && goodsSpec.getIsDefault() == 0) {
+				goodsSpec.setIsDefault(1);
+			}
+		}
+		this.saveOrUpdate(goodsSpec);
+	}
+
+	@Override
+	public void deleteByGoodsIds(List<Long> goodsIds) {
+		baseMapper.delete(Wrappers.lambdaQuery(GoodsSpec.class).in(GoodsSpec::getGoodsId, goodsIds));
+	}
+
+	@Override
+	public List<GoodsSpec> getByGoodsId(Long goodsId) {
+		return this.baseMapper.selectList(Wrappers.lambdaQuery(GoodsSpec.class).eq(GoodsSpec::getGoodsId, goodsId).orderByAsc(GoodsSpec::getSort));
+	}
+
+	@Override
+	public void updateStatus(Long id) {
+		GoodsSpec goodsSpec = this.getById(id);
+		goodsSpec.setIsDefault(goodsSpec.getIsDefault() == 1 ? 0 : 1);
+		this.updateById(goodsSpec);
+		this.flashSpecStatus(goodsSpec.getGoodsId());
+	}
+
+	@Override
+	public void batchOnSale(List<Long> specIds) {
+		this.lambdaUpdate().set(GoodsSpec::getIsSale, GoodsStateEnum.ON_SALE.getValue()).in(GoodsSpec::getId, specIds).update();
+	}
+
+	@Override
+	public void batchShelves(List<Long> specIds) {
+		this.lambdaUpdate().set(GoodsSpec::getIsSale, GoodsStateEnum.UNDERCARRIAGE.getValue()).in(GoodsSpec::getId, specIds).update();
+		GoodsSpec goodsSpec = this.getById(specIds.get(0));
+		this.flashSpecStatus(goodsSpec.getGoodsId());
+	}
+
+	@Override
+	public void batchModifyPrice(List<Long> specIds, BigDecimal salePrice) {
+		this.lambdaUpdate().set(GoodsSpec::getSalePrice, salePrice).in(GoodsSpec::getId, specIds).update();
+	}
+
+	private void flashSpecStatus(Long goodsId) {
+		List<GoodsSpec> list = this.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsId).eq(GoodsSpec::getIsSale, GoodsStateEnum.ON_SALE.getValue()).list();
+		if (list.size() == 0) {
+			goodsInfoService.lambdaUpdate().set(GoodsInfo::getIsSale, GoodsStateEnum.UNDERCARRIAGE.getValue()).eq(GoodsInfo::getId, goodsId).update();
+		} else {
+			// 上架的规格没有默认的，则取上架的一条设置为默认
+			List<GoodsSpec> collect = list.stream().filter(e -> e.getIsDefault() == 1).collect(Collectors.toList());
+			if (collect.size() == 0) {
+				GoodsSpec goodsSpec1 = list.get(0);
+				goodsSpec1.setIsDefault(1);
+				this.updateById(goodsSpec1);
+			}
+		}
+	}
+
+	public String generateGoodsSpecNo() {
+		RedisAtomicLong redisAtomicLong = new RedisAtomicLong(GOODS_SPEC_NO_PREFIX, redisTemplate.getConnectionFactory());
+		long seq = redisAtomicLong.incrementAndGet();
+		return "2" + String.format("%08d", seq);
+	}
+
+}

src/main/java/org/springblade/modules/mall/service/impl/IActivitiesGoodsServiceImpl.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.mall.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.modules.mall.entity.ActivitiesGoods;
+import org.springblade.modules.mall.mapper.ActivitiesGoodsMapper;
+import org.springblade.modules.mall.service.IActivitiesGoodsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Author pangqijun
+ * Date 2022/10/27
+ * Description
+ */
+@Slf4j
+@Service
+public class IActivitiesGoodsServiceImpl extends ServiceImpl<ActivitiesGoodsMapper, ActivitiesGoods> implements IActivitiesGoodsService {
+}

src/main/java/org/springblade/modules/mall/vo/BrandsInfoVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.BrandsInfo;
+
+/**
+ * 品牌信息表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "BrandsInfoVO对象", description = "品牌信息表")
+public class BrandsInfoVO extends BrandsInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/vo/CategoryInfoVO.java

@@ -0,0 +1,88 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.enums.DictEnum;
+import org.springblade.core.tool.node.INode;
+import org.springblade.modules.mall.entity.CategoryInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类别表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "CategoryInfoVO对象", description = "类别表")
+public class CategoryInfoVO extends CategoryInfo implements INode<CategoryInfoVO> {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 父节点ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long parentId;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long key;
+
+	/**
+	 * 子孙节点
+	 */
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	private List<CategoryInfoVO> children;
+
+	/**
+	 * 是否有子孙节点
+	 */
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	private Boolean hasChildren;
+
+	@Override
+	public List<CategoryInfoVO> getChildren() {
+		if (this.children == null) {
+			this.children = new ArrayList<>();
+		}
+		return this.children;
+	}
+
+	private List<Long> parentIdArr;
+
+	/**
+	 * 上级
+	 */
+	private String parentName;
+
+	/**
+	 * 状态描述
+	 */
+	private String stateDesc;
+
+	public String getStateDesc() {
+		return DictCache.getValue(DictEnum.STATE, super.getState().toString());
+	}
+}

src/main/java/org/springblade/modules/mall/vo/CostBreakdownVO.java

@@ -0,0 +1,54 @@
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.enums.GoodsSourceEnum;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 成本明细
+ */
+@Data
+public class CostBreakdownVO {
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	@ApiModelProperty(value = "第三方商品来源 1-胜天半子 2-唯品尚")
+	private String source;
+	@ApiModelProperty(value = "第三方商品来源名称")
+	private String sourceName;
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	@ApiModelProperty(value = "商品名称")
+	private String goodsName;
+	@ApiModelProperty(value = "规格名称")
+	private String spceName;
+	@ApiModelProperty(value = "名称字符串")
+	private String nameStr;
+	@ApiModelProperty(value = "协议价")
+	private BigDecimal agreementPrice=BigDecimal.ZERO;
+	@ApiModelProperty(value = "销量")
+	private Integer num=0;
+	@ApiModelProperty(value = "总协议价")
+	private BigDecimal totalAgreementPrice=BigDecimal.ZERO;
+
+	public String getNameStr() {
+		StringBuilder sb = new StringBuilder();
+		if (this.brandName != null) {
+			sb.append(this.brandName);
+		}
+		if (this.goodsName != null) {
+			sb.append(this.goodsName);
+		}
+		if (this.spceName != null) {
+			sb.append(this.spceName);
+		}
+		return sb.toString();
+	}
+
+	public String getSourceName() {
+		return GoodsSourceEnum.getNameByValue(source);
+	}
+
+}

src/main/java/org/springblade/modules/mall/vo/GoodsImgVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsImg;
+
+/**
+ * 商品图片(视频)视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsImgVO对象", description = "商品图片(视频)")
+public class GoodsImgVO extends GoodsImg {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/vo/GoodsInfoVO.java

@@ -0,0 +1,71 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsInfo;
+import org.springblade.modules.mall.entity.GoodsParams;
+import org.springblade.modules.mall.entity.GoodsSpec;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 商品表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsInfoVO对象", description = "商品表")
+public class GoodsInfoVO extends GoodsInfo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("商品参数列表")
+	private List<GoodsParams> goodsParamsList;
+	@ApiModelProperty("商品规格列表")
+	private List<GoodsSpec> goodsSpecList;
+
+	@ApiModelProperty(value = "购买时获得的积分数")
+	private BigDecimal obtainIntegral;
+
+	@ApiModelProperty(value = "购买时获得的绿色积分数")
+	private BigDecimal obtainGreenIntegral;
+
+	@ApiModelProperty(value = "积分兑换时需要扣除的金额")
+	private BigDecimal needAmount;
+
+	@ApiModelProperty(value = "抵扣所需积分")
+	private BigDecimal needIntegral;
+
+	private Integer isActivity;
+
+	private String brandDesc;
+
+	public BigDecimal getNeedAmount() {
+		return needAmount == null ? new BigDecimal("0.00") : needAmount;
+	}
+
+	public BigDecimal getNeedIntegral() {
+		return needIntegral == null ? new BigDecimal("0.00") : needIntegral;
+	}
+}

src/main/java/org/springblade/modules/mall/vo/GoodsParamsVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsParams;
+
+/**
+ * 商品参数表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsParamsVO对象", description = "商品参数表")
+public class GoodsParamsVO extends GoodsParams {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/mall/vo/GoodsSpecVO.java

@@ -0,0 +1,37 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.mall.entity.GoodsSpec;
+
+/**
+ * 商品规格表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-05-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GoodsSpecVO对象", description = "商品规格表")
+public class GoodsSpecVO extends GoodsSpec {
+	private static final long serialVersionUID = 1L;
+
+
+}

src/main/java/org/springblade/modules/mall/vo/GrossProfitVO.java

@@ -0,0 +1,28 @@
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 毛利信息
+ */
+@Data
+public class GrossProfitVO {
+	@ApiModelProperty(value = "来源")
+	private String source;
+	@ApiModelProperty(value = "总实收金额")
+	private BigDecimal totalPaidInAmount = BigDecimal.ZERO;
+	@ApiModelProperty(value = "总协议价")
+	private BigDecimal totalAgreementPrice = BigDecimal.ZERO;
+	@ApiModelProperty(value = "毛利")
+	private BigDecimal grossProfit = BigDecimal.ZERO;
+	@ApiModelProperty(value = "总毛利")
+	private BigDecimal totalGrossProfit = BigDecimal.ZERO;
+	@ApiModelProperty(value = "毛利率")
+	private String rateOfGrossProfit;
+	@ApiModelProperty(value = "占比")
+	private String ratio;
+
+}

src/main/java/org/springblade/modules/mall/vo/SalesVO.java

@@ -0,0 +1,75 @@
+package org.springblade.modules.mall.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.common.enums.GoodsSourceEnum;
+import org.springblade.common.enums.ZoneTypeEnum;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 销售信息
+ */
+@Data
+public class SalesVO {
+	@ApiModelProperty(value = "日期")
+	private String time;
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	@ApiModelProperty(value = "来源")
+	private String source;
+	@ApiModelProperty(value = "来源名称")
+	private String sourceName;
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	@ApiModelProperty(value = "商品名称")
+	private String goodsName;
+	@ApiModelProperty(value = "规格Id")
+	private String specId;
+	@ApiModelProperty(value = "规格名称")
+	private String goodsSpecNames;
+	@ApiModelProperty(value = "名称字符串")
+	private String nameStr;
+	@ApiModelProperty(value = "销售价格")
+	private String salePrice;
+	@ApiModelProperty(value = "协议价格")
+	private String agreementPrice;
+	@ApiModelProperty(value = "销售数量")
+	private String totalNum;
+	@ApiModelProperty(value = "应收金额")
+	private BigDecimal receivableAmount=BigDecimal.ZERO;
+	@ApiModelProperty(value = "抵扣金额")
+	private BigDecimal deductionAmount=BigDecimal.ZERO;
+	@ApiModelProperty(value = "实收金额")
+	private BigDecimal paidInAmount=BigDecimal.ZERO;
+	@ApiModelProperty(value = "专区类型")
+	private Integer zoneType;
+	@ApiModelProperty(value = "专区类型名称")
+	private String zoneTypeName;
+
+	public String getNameStr() {
+		StringBuilder sb = new StringBuilder();
+		if (this.brandName != null) {
+			sb.append(this.brandName);
+		}
+		if (this.goodsName != null) {
+			sb.append(this.goodsName);
+		}
+		if (this.goodsSpecNames != null) {
+			sb.append(this.goodsSpecNames);
+		}
+		return sb.toString();
+	}
+	public String getSourceName() {
+		return GoodsSourceEnum.getNameByValue(source);
+	}
+
+	public String getZoneTypeName() {
+		return ZoneTypeEnum.getNameByValue(zoneType);
+	}
+
+	public BigDecimal getPaidInAmount() {
+		return receivableAmount.subtract(deductionAmount);
+	}
+}

src/main/java/org/springblade/modules/mall/vo/ShoppingCartVO.java

@@ -0,0 +1,73 @@
+package org.springblade.modules.mall.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Author pangqijun
+ * Date 2022/7/28
+ * Description
+ */
+@Data
+public class ShoppingCartVO {
+
+	@ApiModelProperty(value = "购物车id")
+	private Long shoppingCartId;
+
+	@ApiModelProperty(value = "商品id")
+	private Long goodsInfoId;
+
+	@ApiModelProperty(value = "商品名称")
+	private String goodsInfoName;
+
+	@ApiModelProperty(value = "商品上架状态;1-上架  0-下架")
+	private Integer isSale;
+
+	@ApiModelProperty(value = "专区类型")
+	private Integer zoneType;
+
+	@ApiModelProperty(value = "商品价格")
+	private BigDecimal salePrice;
+
+	@ApiModelProperty(value = "商品图片")
+	private String cover;
+
+	@ApiModelProperty(value = "购买时获得的积分数")
+	private BigDecimal obtainIntegral;
+
+	@ApiModelProperty(value = "积分兑换时需要扣除的金额")
+	private BigDecimal needAmount;
+
+	@ApiModelProperty(value = "抵扣所需积分")
+	private BigDecimal needIntegral;
+
+	/** 规格id */
+	@ApiModelProperty(value = "规格id")
+	private Long goodsSpecId;
+
+	@ApiModelProperty(value = "规格名称")
+	private String goodsSpecName;
+
+	/** 商品数量 */
+	@ApiModelProperty(value = "商品数量")
+	private Integer goodsNum;
+
+	@ApiModelProperty(value = "是否参加活动;1-是  0-否")
+	private Integer isActivity;
+
+	@JsonIgnore
+	private String goodsInfoImg;
+
+	@JsonIgnore
+	private String goodsSpecImg;
+
+	@JsonIgnore
+	private BigDecimal agreementPrice;
+
+	public BigDecimal getSalePrice() {
+		return salePrice != null ? salePrice.setScale(2, BigDecimal.ROUND_HALF_UP) : null;
+	}
+}