Merge branch 'refs/heads/xiaolu' into master

ruoyi-auth/src/main/resources/application.yml

@@ -32,3 +32,8 @@ spring:
       - optional:nacos:application-common.yml
       - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml
+
+tr:
+  wechat:
+    appid: wx3d002d66868332a1
+    secret: 269c120e6973c2a15a97f564d2c4c65

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductPptTemplateController.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.ProductPptTemplateVo;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.product.service.IProductPptTemplateService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * PPT 模板库（公共底版）
+ * 前端访问路由地址为:/product/pptTemplate
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pptTemplate")
+public class ProductPptTemplateController extends BaseController {
+
+    private final IProductPptTemplateService productPptTemplateService;
+
+    /**
+     * 查询PPT 模板库（公共底版）列表
+     */
+    //@SaCheckPermission("product:pptTemplate:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProductPptTemplateVo> list(ProductPptTemplateBo bo, PageQuery pageQuery) {
+        return productPptTemplateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出PPT 模板库（公共底版）列表
+     */
+    //@SaCheckPermission("product:pptTemplate:export")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProductPptTemplateBo bo, HttpServletResponse response) {
+        List<ProductPptTemplateVo> list = productPptTemplateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "PPT 模板库（公共底版）", ProductPptTemplateVo.class, response);
+    }
+
+    /**
+     * 获取PPT 模板库（公共底版）详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("product:pptTemplate:query")
+    @GetMapping("/{id}")
+    public R<ProductPptTemplateVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(productPptTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     */
+    //@SaCheckPermission("product:pptTemplate:add")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProductPptTemplateBo bo) {
+        return toAjax(productPptTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     */
+    //@SaCheckPermission("product:pptTemplate:edit")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProductPptTemplateBo bo) {
+        return toAjax(productPptTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除PPT 模板库（公共底版）
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("product:pptTemplate:remove")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(productPptTemplateService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProuctPptSchemeController.java

@@ -0,0 +1,115 @@
+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.ProuctPptSchemeVo;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.product.service.IProuctPptSchemeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * PPT 方案主
+ * 前端访问路由地址为:/product/pptScheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pptScheme")
+public class ProuctPptSchemeController extends BaseController {
+
+    private final IProuctPptSchemeService prouctPptSchemeService;
+
+    /**
+     * 查询PPT 方案主列表
+     */
+    //@SaCheckPermission("product:pptScheme:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProuctPptSchemeVo> list(ProuctPptSchemeBo bo, PageQuery pageQuery) {
+        return prouctPptSchemeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出PPT 方案主列表
+     */
+    //@SaCheckPermission("product:pptScheme:export")
+    @Log(title = "PPT 方案主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProuctPptSchemeBo bo, HttpServletResponse response) {
+        List<ProuctPptSchemeVo> list = prouctPptSchemeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "PPT 方案主", ProuctPptSchemeVo.class, response);
+    }
+
+    /**
+     * 获取PPT 方案主详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("product:pptScheme:query")
+    @GetMapping("/{id}")
+    public R<ProuctPptSchemeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(prouctPptSchemeService.queryById(id));
+    }
+
+    /**
+     * 新增PPT 方案主
+     */
+    //@SaCheckPermission("product:pptScheme:add")
+    @Log(title = "PPT 方案主", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProuctPptSchemeBo bo) {
+        return toAjax(prouctPptSchemeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改PPT 方案主
+     */
+    //@SaCheckPermission("product:pptScheme:edit")
+    @Log(title = "PPT 方案主", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProuctPptSchemeBo bo) {
+        return toAjax(prouctPptSchemeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除PPT 方案主
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("product:pptScheme:remove")
+    @Log(title = "PPT 方案主", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(prouctPptSchemeService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+    * 分享方案
+    * */
+    @PostMapping("/share")
+    public R<Void> share(@RequestBody ProuctPptSchemeBo bo) {
+        prouctPptSchemeService.share(bo);
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/pc/MyProductController.java

@@ -157,7 +157,6 @@ public class MyProductController {
         productCollectService.remove(Wrappers.lambdaQuery(ProductCollect.class)
             .eq(ProductCollect::getUserId, LoginHelper.getUserId())
             .eq(ProductCollect::getProductId, bo.getProductId())
-            .eq(ProductCollect::getFavoritesId, bo.getFavoritesId())
         );
         return R.ok();
     }

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductPptTemplate.java

@@ -0,0 +1,106 @@
+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;
+
+/**
+ * PPT 模板库（公共底版）对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("product_ppt_template")
+public class ProductPptTemplate extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProuctPptScheme.java

@@ -0,0 +1,168 @@
+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.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * PPT 方案主对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prouct_ppt_scheme")
+public class ProuctPptScheme extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 方案主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+    * 商品数据(json)
+    * */
+    private String productData;
+    /**
+    * 商品数量
+    * */
+    private Integer productNum;
+
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductBaseBo.java

@@ -374,6 +374,11 @@ public class ProductBaseBo extends BaseEntity {
      */
     private Long minOrderQuantity;
 
+    /**
+    * 产品描述
+    * */
+    private String productDescription;
+
     /**
      * 是否可定制
      */

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductPptTemplateBo.java

@@ -0,0 +1,118 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProductPptTemplate;
+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.*;
+
+/**
+ * PPT 模板库（公共底版）业务对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductPptTemplate.class, reverseConvertGenerate = false)
+public class ProductPptTemplateBo extends BaseEntity {
+
+    /**
+     * 模板主键
+     */
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    //@NotBlank(message = "封面底图（Base64 或 CDN URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    //@NotBlank(message = "整篇主题色（Hex）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    //@NotNull(message = "商品排版模式：1简约 2交错 3明细不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    //@NotBlank(message = "品牌名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    //@NotBlank(message = "品牌口号 Slogan不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    //@NotBlank(message = "官网地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    //@NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    //@NotBlank(message = "封面底部 Logo（Base64 或 URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    //@NotBlank(message = "内容页页眉 Logo（Base64 或 URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    //@NotBlank(message = "封面主标题（如：诞生珍礼，非你莫属）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    //@NotBlank(message = "封面副标题（如：卓越品质，专属定制）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    //@NotBlank(message = "内容页统一分类标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    //@NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProuctPptSchemeBo.java

@@ -0,0 +1,196 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProuctPptScheme;
+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.*;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * PPT 方案主业务对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProuctPptScheme.class, reverseConvertGenerate = false)
+public class ProuctPptSchemeBo extends BaseEntity {
+
+    /**
+     * 方案主键
+     */
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    //@NotBlank(message = "（快照）模板名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    //@NotBlank(message = "（快照）封面底图不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    //@NotBlank(message = "（快照）封面 Logo不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    //@NotBlank(message = "（快照）内容页 Logo不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    //@NotBlank(message = "（快照）主题色不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    //@NotNull(message = "（快照）商品排版模式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    //@NotBlank(message = "（快照）封面主标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    //@NotBlank(message = "（快照）封面副标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    //@NotBlank(message = "（快照）方案截止日期，如：方案有效期：2026年12月31日不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    //@NotBlank(message = "（快照）品牌名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    //@NotBlank(message = "（快照）品牌口号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    //@NotBlank(message = "（快照）官网不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    //@NotBlank(message = "（快照）电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    //@NotBlank(message = "（快照）内容页标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    //@NotBlank(message = "是否公开：0私有 1公开（支撑"其他人创建"Tab）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    //@NotBlank(message = "是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    //@NotNull(message = "来源方案 ID（从哪个原始方案分享过来的）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    //@NotNull(message = "分享人 user_id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    //@NotBlank(message = "分享人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    //@NotNull(message = "分享时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    //@NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+    * 被分享者
+    * */
+    private List<Long> userIds;
+
+    private List<Long> productIds;
+
+    /**
+     * 商品数据(json)
+     * */
+    private String productData;
+    /**
+     * 商品数量
+     * */
+    private Integer productNum;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductBaseVo.java

@@ -440,6 +440,11 @@ public class ProductBaseVo implements Serializable {
      * */
     private Long virtualInventory;
 
+    /**
+     * 产品描述
+     * */
+    private String productDescription;
+
 
     /**
      * 定制说明

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductPptTemplateVo.java

@@ -0,0 +1,136 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProductPptTemplate;
+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;
+
+
+
+/**
+ * PPT 模板库（公共底版）视图对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProductPptTemplate.class)
+public class ProductPptTemplateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+    @ExcelProperty(value = "模板主键")
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    @ExcelProperty(value = "模板名称", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "显=示在列表")
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    @ExcelProperty(value = "封面底图", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,C=DN,U=RL")
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    @ExcelProperty(value = "整篇主题色", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "H=ex")
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    @ExcelProperty(value = "商品排版模式：1简约 2交错 3明细")
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    @ExcelProperty(value = "品牌名称")
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    @ExcelProperty(value = "品牌口号 Slogan")
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    @ExcelProperty(value = "官网地址")
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    @ExcelProperty(value = "封面底部 Logo", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,U=RL")
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    @ExcelProperty(value = "内容页页眉 Logo", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,U=RL")
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    @ExcelProperty(value = "封面主标题", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：诞生珍礼，非你莫属")
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    @ExcelProperty(value = "封面副标题", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：卓越品质，专属定制")
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    @ExcelProperty(value = "内容页统一分类标题")
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProuctPptSchemeVo.java

@@ -0,0 +1,217 @@
+package org.dromara.product.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.product.domain.ProuctPptScheme;
+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;
+
+
+
+/**
+ * PPT 方案主视图对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProuctPptScheme.class)
+public class ProuctPptSchemeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 方案主键
+     */
+    @ExcelProperty(value = "方案主键")
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    @ExcelProperty(value = "方案名称", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "用=户自定义")
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    @ExcelProperty(value = "选用的原始模板 ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "p=pt_template.id")
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    @ExcelProperty(value = "方案归属者 user_id", converter = ExcelDictConvert.class)
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    @ExcelProperty(value = "是否公开：0私有 1公开", converter = ExcelDictConvert.class)
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    @ExcelProperty(value = "是否由他人分享而来：0否 1是", converter = ExcelDictConvert.class)
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    @ExcelProperty(value = "来源方案 ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "从=哪个原始方案分享过来的")
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    @ExcelProperty(value = "分享人 user_id")
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    @ExcelProperty(value = "分享人姓名")
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    @ExcelProperty(value = "分享时间")
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 商品数据(json)
+     * */
+    private String productData;
+    /**
+     * 商品数量
+     * */
+    private Integer productNum;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductPptTemplateMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * PPT 模板库（公共底版）Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface ProductPptTemplateMapper extends BaseMapperPlus<ProductPptTemplate, ProductPptTemplateVo> {
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProuctPptSchemeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * PPT 方案主Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface ProuctPptSchemeMapper extends BaseMapperPlus<ProuctPptScheme, ProuctPptSchemeVo> {
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductPptTemplateService.java

@@ -0,0 +1,70 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * PPT 模板库（公共底版）Service接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface IProductPptTemplateService extends IService<ProductPptTemplate>{
+
+    /**
+     * 查询PPT 模板库（公共底版）
+     *
+     * @param id 主键
+     * @return PPT 模板库（公共底版）
+     */
+    ProductPptTemplateVo queryById(Long id);
+
+    /**
+     * 分页查询PPT 模板库（公共底版）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 模板库（公共底版）分页列表
+     */
+    TableDataInfo<ProductPptTemplateVo> queryPageList(ProductPptTemplateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的PPT 模板库（公共底版）列表
+     *
+     * @param bo 查询条件
+     * @return PPT 模板库（公共底版）列表
+     */
+    List<ProductPptTemplateVo> queryList(ProductPptTemplateBo bo);
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProductPptTemplateBo bo);
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProductPptTemplateBo bo);
+
+    /**
+     * 校验并批量删除PPT 模板库（公共底版）信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProuctPptSchemeService.java

@@ -0,0 +1,75 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * PPT 方案主Service接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface IProuctPptSchemeService extends IService<ProuctPptScheme>{
+
+    /**
+     * 查询PPT 方案主
+     *
+     * @param id 主键
+     * @return PPT 方案主
+     */
+    ProuctPptSchemeVo queryById(Long id);
+
+    /**
+     * 分页查询PPT 方案主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 方案主分页列表
+     */
+    TableDataInfo<ProuctPptSchemeVo> queryPageList(ProuctPptSchemeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的PPT 方案主列表
+     *
+     * @param bo 查询条件
+     * @return PPT 方案主列表
+     */
+    List<ProuctPptSchemeVo> queryList(ProuctPptSchemeBo bo);
+
+    /**
+     * 新增PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProuctPptSchemeBo bo);
+
+    /**
+     * 修改PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProuctPptSchemeBo bo);
+
+    /**
+     * 校验并批量删除PPT 方案主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+    * 分享方案
+    * */
+    void share(ProuctPptSchemeBo bo);
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductAttributesServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.product.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 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;
@@ -124,7 +125,21 @@ public class ProductAttributesServiceImpl  extends ServiceImpl<ProductAttributes
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(ProductAttributes entity){
-        //TODO 做一些数据校验,如唯一约束
+        // 校验同一分类下是否存在相同属性名称的属性
+        if (entity.getCategoryId() != null && entity.getProductAttributesName() != null) {
+            LambdaQueryWrapper<ProductAttributes> lqw = Wrappers.lambdaQuery();
+            lqw.ne(ObjectUtil.isNotEmpty(entity.getId()), ProductAttributes::getId, entity.getId());
+            lqw.eq(ProductAttributes::getCategoryId, entity.getCategoryId());
+            lqw.eq(ProductAttributes::getProductAttributesName, entity.getProductAttributesName());
+            // 编辑时排除当前记录
+            if (entity.getId() != null) {
+                lqw.ne(ProductAttributes::getId, entity.getId());
+            }
+            long count = baseMapper.selectCount(lqw);
+            if (count > 0) {
+                throw new ServiceException("同一分类下请不要添加相同属性");
+            }
+        }
     }
 
     /**

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseAuditServiceImpl.java

@@ -193,6 +193,7 @@ public class ProductBaseAuditServiceImpl extends ServiceImpl<ProductBaseAuditMap
     public Boolean insertByBo(ProductBaseAuditBo bo) {
         ProductBaseAudit add = MapstructUtils.convert(bo, ProductBaseAudit.class);
         LoginUser loginUser = LoginHelper.getLoginUser();
+        add.setId(null);
         if(ObjectUtil.isNotEmpty(loginUser.getSupplierId())){
             add.setCreateById(loginUser.getSupplierId());
             add.setCreateByType(1);

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseServiceImpl.java

@@ -39,6 +39,7 @@ import org.dromara.product.domain.ProductClassification;
 import org.dromara.product.domain.ProductCustomization;
 import org.dromara.product.service.IProductBaseService;
 
+import java.math.RoundingMode;
 import java.util.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -265,6 +266,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             vo.setProductNature(extend.getPurchaseManagerNo());
             vo.setPurchasingPersonnel(extend.getPurchaseNo());
             vo.setSupplierNo(extend.getSupplierNo());
+            vo.setProductDescription(extend.getProductDescription());
         }
 
         // 3. 查询并填充价格库存信息（product_price_inventory表）
@@ -511,16 +513,16 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
             switch (bo.getPriceRange()) {
                 case "1":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 1, 100);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "1", "100");
                     break;
                 case "2":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 100, 500);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "100", "500");
                     break;
                 case "3":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 500, 1000);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "500", "1000");
                     break;
                 case "4":
-                    wrapper.ge(ProductBaseVo::getMemberPrice, 1000);
+                    wrapper.ge(ProductBaseVo::getMemberPrice, "1000");
                     break;
             }
         }
@@ -647,7 +649,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     private void saveProductDetail(ProductBaseBo bo, Long productId) {
         ProductPhotos productPhotos= new ProductPhotos();
         productPhotos.setProductId(productId);
-        productPhotos.setImageUrl(bo.getProductImage());
+        productPhotos.setImageUrl(bo.getImageUrl());
         productPhotos.setProductDetailsPc(bo.getPcDetail());
         productPhotos.setProductDetailsApp(bo.getMobileDetail());
         photosMapper.insert(productPhotos);
@@ -788,6 +790,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         extend.setShelfComments(bo.getShelfComments());
         extend.setPurchaseManagerNo(bo.getProductNature());
         extend.setPurchaseNo(bo.getPurchasingPersonnel());
+        extend.setProductDescription(bo.getProductDescription());
         extendMapper.insert(extend);
     }
 
@@ -871,6 +874,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             if (bo.getProductNature() != null) existing.setPurchaseManagerNo(bo.getProductNature());
             if (bo.getPurchasingPersonnel() != null) existing.setPurchaseNo(bo.getPurchasingPersonnel());
             if (bo.getSupplierNo() != null) existing.setSupplierNo(bo.getSupplierNo());
+            if (bo.getProductDescription() != null) existing.setProductDescription(bo.getProductDescription());
             extendMapper.updateById(existing);
         } else {
             // 不存在则新增
@@ -1519,13 +1523,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
             switch (bo.getPriceRange()) {
                 case "1":
-                    lqw.between("b.market_price", 1, 100);
+                    lqw.between("p.market_price", 1, 100);
                 case "2":
-                    lqw.between("b.market_price", 100, 500);
+                    lqw.between("p.market_price", 100, 500);
                 case "3":
-                    lqw.between("b.market_price", 500, 1000);
+                    lqw.between("p.market_price", 500, 1000);
                 case "4":
-                    lqw.ge("b.market_price", 1000);
+                    lqw.ge("p.market_price", 1000);
             }
         }
         if(bo.getSortField() != null && bo.getSortOrder() != null){
@@ -1542,7 +1546,6 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
                 }
             }
         }
-        lqw.select("b.id","b.product_image","p.market_price","p.member_price","p.min_selling_price","p.min_order_quantity","b.item_name","u.unit_name");
 
         // 使用ES分页查询
         try {
@@ -1571,6 +1574,15 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         return TableDataInfo.build();
     }
 
+    public static void main(String[] args) {
+        Date oldPlanStartAt = DateUtil.parse("2026-03-18 00:00:00");
+        Date oldPlanEndAt = DateUtil.parse("2026-04-18 00:00:00");
+        BigDecimal time = BigDecimal.valueOf(DateUtil.betweenDay(oldPlanStartAt, oldPlanEndAt, true) + 1);
+        BigDecimal priceAvgLease = BigDecimal.valueOf(549.90).divide(time, 2, RoundingMode.HALF_UP);
+
+        System.out.println(priceAvgLease);
+    }
+
     /**
      * PC端商品浏览记录
      *

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductPptTemplateServiceImpl.java

@@ -0,0 +1,147 @@
+package org.dromara.product.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.mapper.ProductPptTemplateMapper;
+import org.dromara.product.service.IProductPptTemplateService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * PPT 模板库（公共底版）Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProductPptTemplateServiceImpl  extends ServiceImpl<ProductPptTemplateMapper, ProductPptTemplate> implements IProductPptTemplateService {
+
+    private final ProductPptTemplateMapper baseMapper;
+
+    /**
+     * 查询PPT 模板库（公共底版）
+     *
+     * @param id 主键
+     * @return PPT 模板库（公共底版）
+     */
+    @Override
+    public ProductPptTemplateVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询PPT 模板库（公共底版）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 模板库（公共底版）分页列表
+     */
+    @Override
+    public TableDataInfo<ProductPptTemplateVo> queryPageList(ProductPptTemplateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProductPptTemplate> lqw = buildQueryWrapper(bo);
+        Page<ProductPptTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的PPT 模板库（公共底版）列表
+     *
+     * @param bo 查询条件
+     * @return PPT 模板库（公共底版）列表
+     */
+    @Override
+    public List<ProductPptTemplateVo> queryList(ProductPptTemplateBo bo) {
+        LambdaQueryWrapper<ProductPptTemplate> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProductPptTemplate> buildQueryWrapper(ProductPptTemplateBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProductPptTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProductPptTemplate::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ProductPptTemplate::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCover()), ProductPptTemplate::getCover, bo.getCover());
+        lqw.eq(StringUtils.isNotBlank(bo.getThemeColor()), ProductPptTemplate::getThemeColor, bo.getThemeColor());
+        lqw.eq(bo.getItemsPerPage() != null, ProductPptTemplate::getItemsPerPage, bo.getItemsPerPage());
+        lqw.like(StringUtils.isNotBlank(bo.getBrandName()), ProductPptTemplate::getBrandName, bo.getBrandName());
+        lqw.eq(StringUtils.isNotBlank(bo.getBrandSlogan()), ProductPptTemplate::getBrandSlogan, bo.getBrandSlogan());
+        lqw.eq(StringUtils.isNotBlank(bo.getWebsite()), ProductPptTemplate::getWebsite, bo.getWebsite());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ProductPptTemplate::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverLogo()), ProductPptTemplate::getCoverLogo, bo.getCoverLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getContentLogo()), ProductPptTemplate::getContentLogo, bo.getContentLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverTitle()), ProductPptTemplate::getCoverTitle, bo.getCoverTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverSubTitle()), ProductPptTemplate::getCoverSubTitle, bo.getCoverSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getContentTitle()), ProductPptTemplate::getContentTitle, bo.getContentTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProductPptTemplate::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProductPptTemplate::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProductPptTemplateBo bo) {
+        ProductPptTemplate add = MapstructUtils.convert(bo, ProductPptTemplate.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProductPptTemplateBo bo) {
+        ProductPptTemplate update = MapstructUtils.convert(bo, ProductPptTemplate.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProductPptTemplate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除PPT 模板库（公共底版）信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProuctPptSchemeServiceImpl.java

@@ -0,0 +1,220 @@
+package org.dromara.product.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.dubbo.config.annotation.DubboReference;
+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.common.satoken.utils.LoginHelper;
+import org.dromara.product.domain.ProductBase;
+import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.mapper.ProductBaseMapper;
+import org.dromara.product.service.IProductBaseService;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.vo.RemoteUserVo;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.mapper.ProuctPptSchemeMapper;
+import org.dromara.product.service.IProuctPptSchemeService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * PPT 方案主Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProuctPptSchemeServiceImpl  extends ServiceImpl<ProuctPptSchemeMapper, ProuctPptScheme> implements IProuctPptSchemeService {
+
+    private final ProuctPptSchemeMapper baseMapper;
+
+    private final IProductBaseService productBaseService;
+    @DubboReference
+    private RemoteUserService remoteUserService;
+
+
+    /**
+     * 查询PPT 方案主
+     *
+     * @param id 主键
+     * @return PPT 方案主
+     */
+    @Override
+    public ProuctPptSchemeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询PPT 方案主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 方案主分页列表
+     */
+    @Override
+    public TableDataInfo<ProuctPptSchemeVo> queryPageList(ProuctPptSchemeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProuctPptScheme> lqw = buildQueryWrapper(bo);
+        Page<ProuctPptSchemeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的PPT 方案主列表
+     *
+     * @param bo 查询条件
+     * @return PPT 方案主列表
+     */
+    @Override
+    public List<ProuctPptSchemeVo> queryList(ProuctPptSchemeBo bo) {
+        LambdaQueryWrapper<ProuctPptScheme> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProuctPptScheme> buildQueryWrapper(ProuctPptSchemeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProuctPptScheme> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ProuctPptScheme::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ProuctPptScheme::getName, bo.getName());
+        lqw.eq(bo.getTemplateId() != null, ProuctPptScheme::getTemplateId, bo.getTemplateId());
+        lqw.like(StringUtils.isNotBlank(bo.getTplName()), ProuctPptScheme::getTplName, bo.getTplName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCover()), ProuctPptScheme::getTplCover, bo.getTplCover());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverLogo()), ProuctPptScheme::getTplCoverLogo, bo.getTplCoverLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplContentLogo()), ProuctPptScheme::getTplContentLogo, bo.getTplContentLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplThemeColor()), ProuctPptScheme::getTplThemeColor, bo.getTplThemeColor());
+        lqw.eq(bo.getTplItemsPerPage() != null, ProuctPptScheme::getTplItemsPerPage, bo.getTplItemsPerPage());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverTitle()), ProuctPptScheme::getTplCoverTitle, bo.getTplCoverTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverSubTitle()), ProuctPptScheme::getTplCoverSubTitle, bo.getTplCoverSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplValidity()), ProuctPptScheme::getTplValidity, bo.getTplValidity());
+        lqw.like(StringUtils.isNotBlank(bo.getTplBrandName()), ProuctPptScheme::getTplBrandName, bo.getTplBrandName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplBrandSlogan()), ProuctPptScheme::getTplBrandSlogan, bo.getTplBrandSlogan());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplWebsite()), ProuctPptScheme::getTplWebsite, bo.getTplWebsite());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplPhone()), ProuctPptScheme::getTplPhone, bo.getTplPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplContentTitle()), ProuctPptScheme::getTplContentTitle, bo.getTplContentTitle());
+        lqw.eq(bo.getOwnerId() != null, ProuctPptScheme::getOwnerId, bo.getOwnerId());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPublic()), ProuctPptScheme::getIsPublic, bo.getIsPublic());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsShared()), ProuctPptScheme::getIsShared, bo.getIsShared());
+        lqw.eq(bo.getSourceSchemeId() != null, ProuctPptScheme::getSourceSchemeId, bo.getSourceSchemeId());
+        lqw.eq(bo.getSharerId() != null, ProuctPptScheme::getSharerId, bo.getSharerId());
+        lqw.like(StringUtils.isNotBlank(bo.getSharerName()), ProuctPptScheme::getSharerName, bo.getSharerName());
+        lqw.eq(bo.getShareTime() != null, ProuctPptScheme::getShareTime, bo.getShareTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProuctPptScheme::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProuctPptScheme::getPlatformCode, bo.getPlatformCode());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getCreateBy()), ProuctPptScheme::getCreateBy, bo.getCreateBy());
+        return lqw;
+    }
+
+    /**
+     * 新增PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProuctPptSchemeBo bo) {
+        ProuctPptScheme add = MapstructUtils.convert(bo, ProuctPptScheme.class);
+        if (ObjectUtil.isEmpty(bo.getProductIds())) {
+            throw new ServiceException("请选择产品");
+        }
+        List<ProductBaseVo> productBaseVos = bo.getProductIds().stream().map(productBaseService::queryById).collect(Collectors.toList());
+        add.setProductData(JSONUtil.toJsonStr(productBaseVos));
+        validEntityBeforeSave(add);
+        add.setOwnerId(LoginHelper.getUserId());
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProuctPptSchemeBo bo) {
+        ProuctPptScheme update = MapstructUtils.convert(bo, ProuctPptScheme.class);
+        validEntityBeforeSave(update);
+        if (ObjectUtil.isEmpty(bo.getProductIds())) {
+            throw new ServiceException("请选择产品");
+        }
+        List<ProductBaseVo> productBaseVos = bo.getProductIds().stream().map(productBaseService::queryById).collect(Collectors.toList());
+        update.setProductData(JSONUtil.toJsonStr(productBaseVos));
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProuctPptScheme entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除PPT 方案主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 分享方案
+     *
+
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void share(ProuctPptSchemeBo bo) {
+        if (ObjectUtil.isEmpty(bo.getUserIds())) {
+            throw new ServiceException("请选择用户");
+        }
+        //查询用户
+        List<RemoteUserVo> userVos = remoteUserService.selectListByIds(bo.getUserIds());
+        //获取方案信息
+        ProuctPptSchemeVo prouctPptSchemeVo = baseMapper.selectVoById(bo.getId());
+        if (ObjectUtil.isEmpty(prouctPptSchemeVo)) {
+            throw new ServiceException("方案不存在");
+        }
+        List<ProuctPptScheme> prouctPptSchemes = userVos.stream().map(userVo -> {
+            ProuctPptScheme prouctPptScheme = BeanUtil.toBean(prouctPptSchemeVo, ProuctPptScheme.class);
+            prouctPptScheme.setId(null);
+            prouctPptScheme.setSharerId(LoginHelper.getUserId());
+            prouctPptScheme.setSharerName(LoginHelper.getLoginUser().getNickname());
+            prouctPptScheme.setShareTime(DateUtil.date());
+            prouctPptScheme.setIsShared("1");
+            prouctPptScheme.setOwnerId(userVo.getUserId());
+            return prouctPptScheme;
+        }).collect(Collectors.toList());
+        baseMapper.insertBatch(prouctPptSchemes);
+    }
+}

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductPptTemplateMapper.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.ProductPptTemplateMapper">
+
+</mapper>

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProuctPptSchemeMapper.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.ProuctPptSchemeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -97,6 +97,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .like(StringUtils.isNotBlank(user.getNickName()), SysUser::getNickName, user.getNickName())
             .eq(StringUtils.isNotBlank(user.getStatus()), SysUser::getStatus, user.getStatus())
             .like(StringUtils.isNotBlank(user.getPhonenumber()), SysUser::getPhonenumber, user.getPhonenumber())
+            .eq(ObjectUtil.isNotEmpty(user.getUserSonType()), SysUser::getUserSonType, user.getUserSonType())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysUser::getCreateTime, params.get("beginTime"), params.get("endTime"))
             .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {