Просмотр исходного кода

feat(product): 添加精品商品池和自营商品池功能

- 新增精品商品池相关实体类、业务对象、视图对象和映射文件
- 新增自营商品池相关实体类、业务对象、视图对象和映射文件
- 实现精品商品池和自营商品池的CRUD操作接口
- 添加精品商品池和自营商品池的控制器实现
- 实现商品池审核状态变更时的数据同步逻辑
- 添加数据校验和异常处理机制
- 集成Excel导出功能和分页查询支持
肖路 2 недель назад
Родитель
Сommit
700d88167c
16 измененных файлов с 1055 добавлено и 0 удалено
  1. 106 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductExquisiteController.java
  2. 108 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductSelfController.java
  3. 46 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductExquisite.java
  4. 46 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductSelf.java
  5. 47 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductExquisiteBo.java
  6. 47 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductSelfBo.java
  7. 56 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductExquisiteVo.java
  8. 56 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductSelfVo.java
  9. 15 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductExquisiteMapper.java
  10. 15 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductSelfMapper.java
  11. 70 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductExquisiteService.java
  12. 70 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductSelfService.java
  13. 179 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductExquisiteServiceImpl.java
  14. 180 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductSelfServiceImpl.java
  15. 7 0
      ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductExquisiteMapper.xml
  16. 7 0
      ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductSelfMapper.xml

+ 106 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductExquisiteController.java

@@ -0,0 +1,106 @@
+package org.dromara.product.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.product.domain.vo.ProductExquisiteVo;
+import org.dromara.product.domain.bo.ProductExquisiteBo;
+import org.dromara.product.service.IProductExquisiteService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 精品商品池
+ * 前端访问路由地址为:/product/productExquisite
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/productExquisite")
+public class ProductExquisiteController extends BaseController {
+
+    private final IProductExquisiteService productExquisiteService;
+
+    /**
+     * 查询精品商品池列表
+     */
+    //@SaCheckPermission("product:productExquisite:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProductExquisiteVo> list(ProductExquisiteBo bo, PageQuery pageQuery) {
+        return productExquisiteService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出精品商品池列表
+     */
+    //@SaCheckPermission("product:productExquisite:export")
+    @Log(title = "精品商品池", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProductExquisiteBo bo, HttpServletResponse response) {
+        List<ProductExquisiteVo> list = productExquisiteService.queryList(bo);
+        ExcelUtil.exportExcel(list, "精品商品池", ProductExquisiteVo.class, response);
+    }
+
+    /**
+     * 获取精品商品池详细信息
+     *
+     * @param productId 主键
+     */
+    //@SaCheckPermission("product:productExquisite:query")
+    @GetMapping("/{productId}")
+    public R<ProductExquisiteVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("productId") Long productId) {
+        return R.ok(productExquisiteService.queryById(productId));
+    }
+
+    /**
+     * 新增精品商品池
+     */
+    //@SaCheckPermission("product:productExquisite:add")
+    @Log(title = "精品商品池", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProductExquisiteBo bo) {
+        return toAjax(productExquisiteService.insertByBo(bo));
+    }
+
+    /**
+     * 修改精品商品池
+     */
+    //@SaCheckPermission("product:productExquisite:edit")
+    @Log(title = "精品商品池", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProductExquisiteBo bo) {
+        return toAjax(productExquisiteService.updateByBo(bo));
+    }
+
+    /**
+     * 删除精品商品池
+     *
+     * @param productIds 主键串
+     */
+    //@SaCheckPermission("product:productExquisite:remove")
+    @Log(title = "精品商品池", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{productIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("productIds") Long[] productIds) {
+        return toAjax(productExquisiteService.deleteWithValidByIds(List.of(productIds), true));
+    }
+}

+ 108 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductSelfController.java

@@ -0,0 +1,108 @@
+package org.dromara.product.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.product.domain.vo.ProductSelfVo;
+import org.dromara.product.domain.bo.ProductSelfBo;
+import org.dromara.product.service.IProductSelfService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 自营商品池
+ * 前端访问路由地址为:/product/productSelf
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/productSelf")
+public class ProductSelfController extends BaseController {
+
+    private final IProductSelfService productSelfService;
+
+    /**
+     * 查询自营商品池列表
+     */
+    //@SaCheckPermission("product:productSelf:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProductSelfVo> list(ProductSelfBo bo, PageQuery pageQuery) {
+        return productSelfService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出自营商品池列表
+     */
+    //@SaCheckPermission("product:productSelf:export")
+    @Log(title = "自营商品池", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProductSelfBo bo, HttpServletResponse response) {
+        List<ProductSelfVo> list = productSelfService.queryList(bo);
+        ExcelUtil.exportExcel(list, "自营商品池", ProductSelfVo.class, response);
+    }
+
+    /**
+     * 获取自营商品池详细信息
+     *
+     * @param productId 主键
+     */
+    //@SaCheckPermission("product:productSelf:query")
+    @GetMapping("/{productId}")
+    public R<ProductSelfVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("productId") Long productId) {
+        return R.ok(productSelfService.queryById(productId));
+    }
+
+    /**
+     * 新增自营商品池
+     */
+    //@SaCheckPermission("product:productSelf:add")
+    @Log(title = "自营商品池", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProductSelfBo bo) {
+        return toAjax(productSelfService.insertByBo(bo));
+    }
+
+    /**
+     * 修改自营商品池
+     */
+    //@SaCheckPermission("product:productSelf:edit")
+    @Log(title = "自营商品池", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProductSelfBo bo) {
+        return toAjax(productSelfService.updateByBo(bo));
+    }
+
+    /**
+     * 删除自营商品池
+     *
+     * @param productIds 主键串
+     */
+    //@SaCheckPermission("product:productSelf:remove")
+    @Log(title = "自营商品池", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{productIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("productIds") Long[] productIds) {
+        return toAjax(productSelfService.deleteWithValidByIds(List.of(productIds), true));
+    }
+
+
+}

+ 46 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductExquisite.java

@@ -0,0 +1,46 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 精品商品池对象 product_exquisite
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("product_exquisite")
+public class ProductExquisite extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "product_id")
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

+ 46 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductSelf.java

@@ -0,0 +1,46 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 自营商品池对象 product_self
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("product_self")
+public class ProductSelf extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "product_id")
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

+ 47 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductExquisiteBo.java

@@ -0,0 +1,47 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProductExquisite;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 精品商品池业务对象 product_exquisite
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductExquisite.class, reverseConvertGenerate = false)
+public class ProductExquisiteBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    //@NotNull(message = "产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    //@NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

+ 47 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductSelfBo.java

@@ -0,0 +1,47 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProductSelf;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 自营商品池业务对象 product_self
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductSelf.class, reverseConvertGenerate = false)
+public class ProductSelfBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    //@NotNull(message = "产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    //@NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

+ 56 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductExquisiteVo.java

@@ -0,0 +1,56 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProductExquisite;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 精品商品池视图对象 product_exquisite
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProductExquisite.class)
+public class ProductExquisiteVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    @ExcelProperty(value = "产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回")
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    @ExcelProperty(value = "审核意见")
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

+ 56 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductSelfVo.java

@@ -0,0 +1,56 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProductSelf;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 自营商品池视图对象 product_self
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProductSelf.class)
+public class ProductSelfVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long productId;
+
+    /**
+     * 产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回
+     */
+    @ExcelProperty(value = "产品审核状态:0=待提交,1=待审核,2=审核通过,3=审核驳回")
+    private Integer auditStatus;
+
+    /**
+     * 审核意见
+     */
+    @ExcelProperty(value = "审核意见")
+    private String auditReason;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductExquisiteMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProductExquisite;
+import org.dromara.product.domain.vo.ProductExquisiteVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 精品商品池Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+public interface ProductExquisiteMapper extends BaseMapperPlus<ProductExquisite, ProductExquisiteVo> {
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductSelfMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProductSelf;
+import org.dromara.product.domain.vo.ProductSelfVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 自营商品池Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+public interface ProductSelfMapper extends BaseMapperPlus<ProductSelf, ProductSelfVo> {
+
+}

+ 70 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductExquisiteService.java

@@ -0,0 +1,70 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProductExquisite;
+import org.dromara.product.domain.vo.ProductExquisiteVo;
+import org.dromara.product.domain.bo.ProductExquisiteBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 精品商品池Service接口
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+public interface IProductExquisiteService extends IService<ProductExquisite>{
+
+    /**
+     * 查询精品商品池
+     *
+     * @param productId 主键
+     * @return 精品商品池
+     */
+    ProductExquisiteVo queryById(Long productId);
+
+    /**
+     * 分页查询精品商品池列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 精品商品池分页列表
+     */
+    TableDataInfo<ProductExquisiteVo> queryPageList(ProductExquisiteBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的精品商品池列表
+     *
+     * @param bo 查询条件
+     * @return 精品商品池列表
+     */
+    List<ProductExquisiteVo> queryList(ProductExquisiteBo bo);
+
+    /**
+     * 新增精品商品池
+     *
+     * @param bo 精品商品池
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProductExquisiteBo bo);
+
+    /**
+     * 修改精品商品池
+     *
+     * @param bo 精品商品池
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProductExquisiteBo bo);
+
+    /**
+     * 校验并批量删除精品商品池信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 70 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductSelfService.java

@@ -0,0 +1,70 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProductSelf;
+import org.dromara.product.domain.vo.ProductSelfVo;
+import org.dromara.product.domain.bo.ProductSelfBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 自营商品池Service接口
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+public interface IProductSelfService extends IService<ProductSelf>{
+
+    /**
+     * 查询自营商品池
+     *
+     * @param productId 主键
+     * @return 自营商品池
+     */
+    ProductSelfVo queryById(Long productId);
+
+    /**
+     * 分页查询自营商品池列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 自营商品池分页列表
+     */
+    TableDataInfo<ProductSelfVo> queryPageList(ProductSelfBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的自营商品池列表
+     *
+     * @param bo 查询条件
+     * @return 自营商品池列表
+     */
+    List<ProductSelfVo> queryList(ProductSelfBo bo);
+
+    /**
+     * 新增自营商品池
+     *
+     * @param bo 自营商品池
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProductSelfBo bo);
+
+    /**
+     * 修改自营商品池
+     *
+     * @param bo 自营商品池
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProductSelfBo bo);
+
+    /**
+     * 校验并批量删除自营商品池信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 179 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductExquisiteServiceImpl.java

@@ -0,0 +1,179 @@
+package org.dromara.product.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.easyes.core.conditions.update.LambdaEsUpdateWrapper;
+import org.dromara.product.domain.ProductBase;
+import org.dromara.product.domain.ProductSelf;
+import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.esmapper.ProductEsMapper;
+import org.dromara.product.mapper.ProductBaseMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProductExquisiteBo;
+import org.dromara.product.domain.vo.ProductExquisiteVo;
+import org.dromara.product.domain.ProductExquisite;
+import org.dromara.product.mapper.ProductExquisiteMapper;
+import org.dromara.product.service.IProductExquisiteService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * 精品商品池Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProductExquisiteServiceImpl  extends ServiceImpl<ProductExquisiteMapper, ProductExquisite> implements IProductExquisiteService {
+
+    private final ProductExquisiteMapper baseMapper;
+
+    private final ProductBaseMapper productBaseMapper;
+
+    private final ProductEsMapper productEsMapper;
+
+    /**
+     * 查询精品商品池
+     *
+     * @param productId 主键
+     * @return 精品商品池
+     */
+    @Override
+    public ProductExquisiteVo queryById(Long productId){
+        return baseMapper.selectVoById(productId);
+    }
+
+    /**
+     * 分页查询精品商品池列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 精品商品池分页列表
+     */
+    @Override
+    public TableDataInfo<ProductExquisiteVo> queryPageList(ProductExquisiteBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProductExquisite> lqw = buildQueryWrapper(bo);
+        Page<ProductExquisiteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的精品商品池列表
+     *
+     * @param bo 查询条件
+     * @return 精品商品池列表
+     */
+    @Override
+    public List<ProductExquisiteVo> queryList(ProductExquisiteBo bo) {
+        LambdaQueryWrapper<ProductExquisite> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProductExquisite> buildQueryWrapper(ProductExquisiteBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProductExquisite> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProductExquisite::getProductId);
+        lqw.eq(bo.getAuditStatus() != null, ProductExquisite::getAuditStatus, bo.getAuditStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuditReason()), ProductExquisite::getAuditReason, bo.getAuditReason());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProductExquisite::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增精品商品池
+     *
+     * @param bo 精品商品池
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProductExquisiteBo bo) {
+        ProductExquisite add = MapstructUtils.convert(bo, ProductExquisite.class);
+        validEntityBeforeSave(add);
+        //如果存在该商品为更新
+        if(baseMapper.exists(new LambdaQueryWrapper<ProductExquisite>().eq(ProductExquisite::getProductId, add.getProductId()))){
+            return updateByBo(bo);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setProductId(add.getProductId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改精品商品池
+     *
+     * @param bo 精品商品池
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(ProductExquisiteBo bo) {
+        ProductExquisite update = MapstructUtils.convert(bo, ProductExquisite.class);
+//        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if(Objects.equals(update.getAuditStatus(), 2)){
+            productBaseMapper.update(Wrappers.lambdaUpdate(ProductBase.class)
+                .eq(ProductBase::getId, update.getProductId())
+                .set(ProductBase::getProductCategory, 2)
+            );
+            productEsMapper.update(new LambdaEsUpdateWrapper<ProductBaseVo>()
+                .eq(ProductBaseVo::getId, update.getProductId())
+                .set(ProductBaseVo::getProductCategory, 2)
+            );
+        }else if(Objects.equals(update.getAuditStatus(), 3)){
+            productBaseMapper.update(Wrappers.lambdaUpdate(ProductBase.class)
+                .eq(ProductBase::getId, update.getProductId())
+                .set(ProductBase::getProductCategory, 1)
+            );
+            productEsMapper.update(new LambdaEsUpdateWrapper<ProductBaseVo>()
+                .eq(ProductBaseVo::getId, update.getProductId())
+                .set(ProductBaseVo::getProductCategory, 1)
+            );
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProductExquisite entity){
+
+        //不要重复添加
+        if(baseMapper.exists(new LambdaQueryWrapper<ProductExquisite>()
+            .eq(ProductExquisite::getAuditStatus, 2)
+            .eq(ProductExquisite::getProductId, entity.getProductId()))){
+            throw new ServiceException("商品已添加到池,请勿重复添加");
+        }
+    }
+
+    /**
+     * 校验并批量删除精品商品池信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 180 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductSelfServiceImpl.java

@@ -0,0 +1,180 @@
+package org.dromara.product.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.easyes.core.conditions.update.LambdaEsUpdateWrapper;
+import org.dromara.product.domain.ProductBase;
+import org.dromara.product.domain.ProductExquisite;
+import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.esmapper.ProductEsMapper;
+import org.dromara.product.mapper.ProductBaseMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProductSelfBo;
+import org.dromara.product.domain.vo.ProductSelfVo;
+import org.dromara.product.domain.ProductSelf;
+import org.dromara.product.mapper.ProductSelfMapper;
+import org.dromara.product.service.IProductSelfService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * 自营商品池Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-03-23
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProductSelfServiceImpl  extends ServiceImpl<ProductSelfMapper, ProductSelf> implements IProductSelfService {
+
+    private final ProductSelfMapper baseMapper;
+
+    private final ProductBaseMapper productBaseMapper;
+
+    private final ProductEsMapper productEsMapper;
+
+    /**
+     * 查询自营商品池
+     *
+     * @param productId 主键
+     * @return 自营商品池
+     */
+    @Override
+    public ProductSelfVo queryById(Long productId){
+        return baseMapper.selectVoById(productId);
+    }
+
+    /**
+     * 分页查询自营商品池列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 自营商品池分页列表
+     */
+    @Override
+    public TableDataInfo<ProductSelfVo> queryPageList(ProductSelfBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProductSelf> lqw = buildQueryWrapper(bo);
+        Page<ProductSelfVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的自营商品池列表
+     *
+     * @param bo 查询条件
+     * @return 自营商品池列表
+     */
+    @Override
+    public List<ProductSelfVo> queryList(ProductSelfBo bo) {
+        LambdaQueryWrapper<ProductSelf> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProductSelf> buildQueryWrapper(ProductSelfBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProductSelf> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProductSelf::getProductId);
+        lqw.eq(bo.getAuditStatus() != null, ProductSelf::getAuditStatus, bo.getAuditStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuditReason()), ProductSelf::getAuditReason, bo.getAuditReason());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProductSelf::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增自营商品池
+     *
+     * @param bo 自营商品池
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(ProductSelfBo bo) {
+        ProductSelf add = MapstructUtils.convert(bo, ProductSelf.class);
+        validEntityBeforeSave(add);
+        //如果存在该商品为更新
+        if(baseMapper.exists(new LambdaQueryWrapper<ProductSelf>().eq(ProductSelf::getProductId, add.getProductId()))){
+            return updateByBo(bo);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+
+        if (flag) {
+            bo.setProductId(add.getProductId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改自营商品池
+     *
+     * @param bo 自营商品池
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(ProductSelfBo bo) {
+        ProductSelf update = MapstructUtils.convert(bo, ProductSelf.class);
+//        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if(Objects.equals(update.getAuditStatus(), 2)){
+            productBaseMapper.update(Wrappers.lambdaUpdate(ProductBase.class)
+                .eq(ProductBase::getId, update.getProductId())
+                .set(ProductBase::getIsSelf, 1)
+            );
+            productEsMapper.update(new LambdaEsUpdateWrapper<ProductBaseVo>()
+                .eq(ProductBaseVo::getId, update.getProductId())
+                .set(ProductBaseVo::getIsSelf, 1)
+            );
+        }else if(Objects.equals(update.getAuditStatus(), 3)){
+            productBaseMapper.update(Wrappers.lambdaUpdate(ProductBase.class)
+                .eq(ProductBase::getId, update.getProductId())
+                .set(ProductBase::getIsSelf, 0)
+            );
+            productEsMapper.update(new LambdaEsUpdateWrapper<ProductBaseVo>()
+                .eq(ProductBaseVo::getId, update.getProductId())
+                .set(ProductBaseVo::getIsSelf, 0)
+            );
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProductSelf entity){
+        //不要重复添加
+        if(baseMapper.exists(new LambdaQueryWrapper<ProductSelf>()
+            .eq(ProductSelf::getAuditStatus, 2)
+            .eq(ProductSelf::getProductId, entity.getProductId()))){
+            throw new ServiceException("商品已添加到池,请勿重复添加");
+        }
+    }
+
+    /**
+     * 校验并批量删除自营商品池信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 7 - 0
ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductExquisiteMapper.xml

@@ -0,0 +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.dromara.product.mapper.ProductExquisiteMapper">
+
+</mapper>

+ 7 - 0
ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductSelfMapper.xml

@@ -0,0 +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.dromara.product.mapper.ProductSelfMapper">
+
+</mapper>