ソースを参照

feat(mall): 添加PC端DIY装修页面功能

- 新增DiyPcPageController控制器提供首页装修页面API
- 实现获取平台、工业品、福利、大客户站点首页装修页面功能
- 添加MallDiyPcPage相关实体类、业务对象和视图对象
- 实现MallDiyPcPageService服务接口及具体业务逻辑
- 新增MallDiyPcTemplatePage模板页面管理功能
- 提供装修页面的增删改查、设为首页等完整操作支持
- 添加相应的MyBatis映射文件和数据库操作支持
肖路 1 ヶ月 前
コミット
1f8a389b89
18 ファイル変更1391 行追加0 行削除
  1. 164 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/MallDiyPcPageController.java
  2. 106 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/MallDiyPcTemplatePageController.java
  3. 86 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/pc/DiyPcPageController.java
  4. 76 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MallDiyPcPage.java
  5. 71 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MallDiyPcTemplatePage.java
  6. 82 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MallDiyPcPageBo.java
  7. 76 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MallDiyPcTemplatePageBo.java
  8. 92 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MallDiyPcPageVo.java
  9. 86 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MallDiyPcTemplatePageVo.java
  10. 15 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MallDiyPcPageMapper.java
  11. 15 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MallDiyPcTemplatePageMapper.java
  12. 70 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMallDiyPcPageService.java
  13. 70 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMallDiyPcTemplatePageService.java
  14. 140 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MallDiyPcPageServiceImpl.java
  15. 139 0
      ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MallDiyPcTemplatePageServiceImpl.java
  16. 7 0
      ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/MallDiyPcPageMapper.xml
  17. 7 0
      ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/MallDiyPcTemplatePageMapper.xml
  18. 89 0
      ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ClientSiteProductExportVo.java

+ 164 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/MallDiyPcPageController.java

@@ -0,0 +1,164 @@
+package org.dromara.mall.controller;
+
+import java.util.List;
+import java.util.Objects;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.mall.domain.MallDiyPcPage;
+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.mall.domain.vo.MallDiyPcPageVo;
+import org.dromara.mall.domain.bo.MallDiyPcPageBo;
+import org.dromara.mall.service.IMallDiyPcPageService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * pc装修页面
+ * 前端访问路由地址为:/mall/diyPcPage
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/diyPcPage")
+public class MallDiyPcPageController extends BaseController {
+
+    private final IMallDiyPcPageService mallDiyPcPageService;
+
+    /**
+     * 查询pc装修页面列表
+     */
+    //@SaCheckPermission("mall:diyPcPage:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallDiyPcPageVo> list(MallDiyPcPageBo bo, PageQuery pageQuery) {
+        return mallDiyPcPageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出pc装修页面列表
+     */
+    //@SaCheckPermission("mall:diyPcPage:export")
+    @Log(title = "pc装修页面", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(MallDiyPcPageBo bo, HttpServletResponse response) {
+        List<MallDiyPcPageVo> list = mallDiyPcPageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "pc装修页面", MallDiyPcPageVo.class, response);
+    }
+
+    /**
+     * 获取pc装修页面详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("mall:diyPcPage:query")
+    @GetMapping("/{id}")
+    public R<MallDiyPcPageVo> getInfo(@NotNull(message = "主键不能为空")
+                                      @PathVariable("id") Long id) {
+        return R.ok(mallDiyPcPageService.queryById(id));
+    }
+
+    /**
+     * 新增pc装修页面
+     */
+    //@SaCheckPermission("mall:diyPcPage:add")
+    @Log(title = "pc装修页面", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody MallDiyPcPageBo bo) {
+        if(Objects.equals(bo.getIsHome(), 1)){
+            if(ObjectUtil.isEmpty(bo.getSiteId())){
+                mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getType, bo.getType())
+                    .set(MallDiyPcPage::getIsHome, 0));
+            }else {
+                mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getSiteId, bo.getSiteId())
+                    .set(MallDiyPcPage::getIsHome, 0));
+            }
+
+
+        }
+        return toAjax(mallDiyPcPageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改pc装修页面
+     */
+    //@SaCheckPermission("mall:diyPcPage:edit")
+    @Log(title = "pc装修页面", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MallDiyPcPageBo bo) {
+        if(Objects.equals(bo.getIsHome(), 1)){
+            if(ObjectUtil.isEmpty(bo.getSiteId())){
+                mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getType, bo.getType())
+                    .set(MallDiyPcPage::getIsHome, 0));
+            }else {
+                mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getSiteId, bo.getSiteId())
+                    .set(MallDiyPcPage::getIsHome, 0)
+                );
+            }
+        }
+        return toAjax(mallDiyPcPageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除pc装修页面
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("mall:diyPcPage:remove")
+    @Log(title = "pc装修页面", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(mallDiyPcPageService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+    * 设为首页
+    * */
+    @Log(title = "pc装修页面", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/setHomePage/{id}")
+    public R<Void> setHomePage(@NotEmpty(message = "主键不能为空") @PathVariable("id") Long id){
+        MallDiyPcPage mallDiyPcPage = mallDiyPcPageService.getById(id);
+        //如果是客户站点
+        if (mallDiyPcPage.getSiteId() != null){
+            mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getSiteId, mallDiyPcPage.getSiteId())
+                    .set(MallDiyPcPage::getIsHome, 0));
+            mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getId, id)
+                    .set(MallDiyPcPage::getIsHome, 1));
+        }else{
+            mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getType, mallDiyPcPage.getType())
+                    .set(MallDiyPcPage::getIsHome, 0));
+            mallDiyPcPageService.update(Wrappers.<MallDiyPcPage>lambdaUpdate()
+                    .eq(MallDiyPcPage::getId, id)
+                    .set(MallDiyPcPage::getIsHome, 1));
+        }
+         return R.ok();
+    }
+
+
+}

+ 106 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/MallDiyPcTemplatePageController.java

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

+ 86 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/pc/DiyPcPageController.java

@@ -0,0 +1,86 @@
+package org.dromara.mall.controller.pc;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.mall.domain.MallDiyPcPage;
+import org.dromara.mall.service.IMallDiyPcPageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 前端首页diy装修页面
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/indexDiyPcPage")
+public class DiyPcPageController {
+
+    private final IMallDiyPcPageService mallDiyPcPageService;
+
+    /**
+     * 获取平台首页diy装修页面
+     */
+    @GetMapping("/getPlatformIndexDiyPcPage")
+    public R<MallDiyPcPage> getPlatformIndexDiyPcPage() {
+        MallDiyPcPage one = mallDiyPcPageService.getOne(
+            Wrappers.lambdaQuery(MallDiyPcPage.class)
+                .eq(MallDiyPcPage::getIsHome, 1)
+                .eq(MallDiyPcPage::getType, 1)
+                .last("limit 1")
+        );
+        return R.ok(one);
+    }
+
+    /**
+    * 获取工业品商城首页diy装修页面
+    * */
+    @GetMapping("/getIndustryPlatformIndexDiyPcPage")
+    public R<MallDiyPcPage> getIndustryPlatformIndexDiyPcPage() {
+        MallDiyPcPage one = mallDiyPcPageService.getOne(
+            Wrappers.lambdaQuery(MallDiyPcPage.class)
+                .eq(MallDiyPcPage::getIsHome, 1)
+                .eq(MallDiyPcPage::getType, 2)
+                .last("limit 1")
+        );
+        return R.ok(one);
+    }
+    /**
+    * 获取福利商城首页diy装修页面
+    * */
+    @GetMapping("/getWelfarePlatformIndexDiyPcPage")
+    public R<MallDiyPcPage> getWelfarePlatformIndexDiyPcPage() {
+        MallDiyPcPage one = mallDiyPcPageService.getOne(
+            Wrappers.lambdaQuery(MallDiyPcPage.class)
+                .eq(MallDiyPcPage::getIsHome, 1)
+                .eq(MallDiyPcPage::getType, 3)
+                .last("limit 1")
+        );
+        return R.ok(one);
+    }
+
+    /**
+    * 获取大客户站点首页diy装修页面
+    * */
+    @GetMapping("/getBigCustomerPlatformIndexDiyPcPage")
+    public R<MallDiyPcPage> getBigCustomerPlatformIndexDiyPcPage(Long siteId) {
+        MallDiyPcPage one = mallDiyPcPageService.getOne(
+            Wrappers.lambdaQuery(MallDiyPcPage.class)
+                .eq(MallDiyPcPage::getIsHome, 1)
+                .eq(MallDiyPcPage::getType, 4)
+                .eq(MallDiyPcPage::getSiteId, siteId)
+                .last("limit 1")
+        );
+        return R.ok(one);
+    }
+
+
+
+
+}

+ 76 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MallDiyPcPage.java

@@ -0,0 +1,76 @@
+package org.dromara.mall.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * pc装修页面对象 mall_diy_pc_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("mall_diy_pc_page")
+public class MallDiyPcPage extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 装修页面编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 装修模板编号
+     */
+    private Long templateId;
+
+    /**
+     * 页面名称
+     */
+    private String name;
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    private Long isHome;
+
+
+}

+ 71 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MallDiyPcTemplatePage.java

@@ -0,0 +1,71 @@
+package org.dromara.mall.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * pc装修页面模版对象 mall_diy_pc_template_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("mall_diy_pc_template_page")
+public class MallDiyPcTemplatePage extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 装修页面编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 页面名称
+     */
+    private String name;
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    private String type;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    private Long isHome;
+
+
+}

+ 82 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MallDiyPcPageBo.java

@@ -0,0 +1,82 @@
+package org.dromara.mall.domain.bo;
+
+import org.dromara.mall.domain.MallDiyPcPage;
+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.*;
+
+/**
+ * pc装修页面业务对象 mall_diy_pc_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallDiyPcPage.class, reverseConvertGenerate = false)
+public class MallDiyPcPageBo extends BaseEntity {
+
+    /**
+     * 装修页面编号
+     */
+    private Long id;
+
+    /**
+     * 装修模板编号
+     */
+    //@NotNull(message = "装修模板编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long templateId;
+
+    /**
+     * 页面名称
+     */
+    private String name;
+
+    /**
+     * 站点id
+     */
+    //@NotNull(message = "站点id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    //@NotNull(message = "客户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    //@NotBlank(message = "页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    //@NotBlank(message = "预览图,多个逗号分隔不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    //@NotBlank(message = "页面属性,JSON 格式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    //@NotNull(message = "是否首页不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long isHome;
+
+
+}

+ 76 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MallDiyPcTemplatePageBo.java

@@ -0,0 +1,76 @@
+package org.dromara.mall.domain.bo;
+
+import org.dromara.mall.domain.MallDiyPcTemplatePage;
+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.*;
+
+/**
+ * pc装修页面模版业务对象 mall_diy_pc_template_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallDiyPcTemplatePage.class, reverseConvertGenerate = false)
+public class MallDiyPcTemplatePageBo extends BaseEntity {
+
+    /**
+     * 装修页面编号
+     */
+    private Long id;
+
+    /**
+     * 页面名称
+     */
+    private String name;
+
+    /**
+     * 站点id
+     */
+    //@NotNull(message = "站点id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    //@NotNull(message = "客户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    //@NotBlank(message = "页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    //@NotBlank(message = "预览图,多个逗号分隔不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    //@NotBlank(message = "页面属性,JSON 格式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    //@NotNull(message = "是否首页不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long isHome;
+
+
+}

+ 92 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MallDiyPcPageVo.java

@@ -0,0 +1,92 @@
+package org.dromara.mall.domain.vo;
+
+import org.dromara.mall.domain.MallDiyPcPage;
+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;
+
+
+
+/**
+ * pc装修页面视图对象 mall_diy_pc_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallDiyPcPage.class)
+public class MallDiyPcPageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 装修页面编号
+     */
+    @ExcelProperty(value = "装修页面编号")
+    private Long id;
+
+    /**
+     * 装修模板编号
+     */
+    @ExcelProperty(value = "装修模板编号")
+    private Long templateId;
+
+    /**
+     * 页面名称
+     */
+    @ExcelProperty(value = "页面名称")
+    private String name;
+
+    /**
+     * 站点id
+     */
+    @ExcelProperty(value = "站点id")
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    @ExcelProperty(value = "客户id")
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    @ExcelProperty(value = "页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城")
+    private String type;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    @ExcelProperty(value = "预览图,多个逗号分隔")
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    @ExcelProperty(value = "页面属性,JSON 格式")
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    @ExcelProperty(value = "是否首页")
+    private Long isHome;
+
+
+}

+ 86 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MallDiyPcTemplatePageVo.java

@@ -0,0 +1,86 @@
+package org.dromara.mall.domain.vo;
+
+import org.dromara.mall.domain.MallDiyPcTemplatePage;
+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;
+
+
+
+/**
+ * pc装修页面模版视图对象 mall_diy_pc_template_page
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallDiyPcTemplatePage.class)
+public class MallDiyPcTemplatePageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 装修页面编号
+     */
+    @ExcelProperty(value = "装修页面编号")
+    private Long id;
+
+    /**
+     * 页面名称
+     */
+    @ExcelProperty(value = "页面名称")
+    private String name;
+
+    /**
+     * 站点id
+     */
+    @ExcelProperty(value = "站点id")
+    private Long siteId;
+
+    /**
+     * 客户id
+     */
+    @ExcelProperty(value = "客户id")
+    private Long clientId;
+
+    /**
+     * 页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城
+     */
+    @ExcelProperty(value = "页面类型 1平台商城 2工业品商城 3福利商城 4客户站点商城")
+    private String type;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 预览图,多个逗号分隔
+     */
+    @ExcelProperty(value = "预览图,多个逗号分隔")
+    private String previewPicUrls;
+
+    /**
+     * 页面属性,JSON 格式
+     */
+    @ExcelProperty(value = "页面属性,JSON 格式")
+    private String property;
+
+    /**
+     * 是否首页
+     */
+    @ExcelProperty(value = "是否首页")
+    private Long isHome;
+
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MallDiyPcPageMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mall.mapper;
+
+import org.dromara.mall.domain.MallDiyPcPage;
+import org.dromara.mall.domain.vo.MallDiyPcPageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * pc装修页面Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+public interface MallDiyPcPageMapper extends BaseMapperPlus<MallDiyPcPage, MallDiyPcPageVo> {
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MallDiyPcTemplatePageMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.mall.mapper;
+
+import org.dromara.mall.domain.MallDiyPcTemplatePage;
+import org.dromara.mall.domain.vo.MallDiyPcTemplatePageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * pc装修页面模版Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+public interface MallDiyPcTemplatePageMapper extends BaseMapperPlus<MallDiyPcTemplatePage, MallDiyPcTemplatePageVo> {
+
+}

+ 70 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMallDiyPcPageService.java

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

+ 70 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMallDiyPcTemplatePageService.java

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

+ 140 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MallDiyPcPageServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.mall.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.mall.domain.bo.MallDiyPcPageBo;
+import org.dromara.mall.domain.vo.MallDiyPcPageVo;
+import org.dromara.mall.domain.MallDiyPcPage;
+import org.dromara.mall.mapper.MallDiyPcPageMapper;
+import org.dromara.mall.service.IMallDiyPcPageService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * pc装修页面Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MallDiyPcPageServiceImpl  extends ServiceImpl<MallDiyPcPageMapper, MallDiyPcPage> implements IMallDiyPcPageService {
+
+    private final MallDiyPcPageMapper baseMapper;
+
+    /**
+     * 查询pc装修页面
+     *
+     * @param id 主键
+     * @return pc装修页面
+     */
+    @Override
+    public MallDiyPcPageVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询pc装修页面列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return pc装修页面分页列表
+     */
+    @Override
+    public TableDataInfo<MallDiyPcPageVo> queryPageList(MallDiyPcPageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallDiyPcPage> lqw = buildQueryWrapper(bo);
+        Page<MallDiyPcPageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的pc装修页面列表
+     *
+     * @param bo 查询条件
+     * @return pc装修页面列表
+     */
+    @Override
+    public List<MallDiyPcPageVo> queryList(MallDiyPcPageBo bo) {
+        LambdaQueryWrapper<MallDiyPcPage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallDiyPcPage> buildQueryWrapper(MallDiyPcPageBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<MallDiyPcPage> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(MallDiyPcPage::getId);
+        lqw.eq(bo.getTemplateId() != null, MallDiyPcPage::getTemplateId, bo.getTemplateId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallDiyPcPage::getName, bo.getName());
+        lqw.eq(bo.getSiteId() != null, MallDiyPcPage::getSiteId, bo.getSiteId());
+        lqw.eq(bo.getClientId() != null, MallDiyPcPage::getClientId, bo.getClientId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), MallDiyPcPage::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPreviewPicUrls()), MallDiyPcPage::getPreviewPicUrls, bo.getPreviewPicUrls());
+        lqw.eq(StringUtils.isNotBlank(bo.getProperty()), MallDiyPcPage::getProperty, bo.getProperty());
+        lqw.eq(bo.getIsHome() != null, MallDiyPcPage::getIsHome, bo.getIsHome());
+        return lqw;
+    }
+
+    /**
+     * 新增pc装修页面
+     *
+     * @param bo pc装修页面
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(MallDiyPcPageBo bo) {
+        MallDiyPcPage add = MapstructUtils.convert(bo, MallDiyPcPage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改pc装修页面
+     *
+     * @param bo pc装修页面
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(MallDiyPcPageBo bo) {
+        MallDiyPcPage update = MapstructUtils.convert(bo, MallDiyPcPage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallDiyPcPage entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除pc装修页面信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 139 - 0
ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MallDiyPcTemplatePageServiceImpl.java

@@ -0,0 +1,139 @@
+package org.dromara.mall.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.mall.domain.bo.MallDiyPcTemplatePageBo;
+import org.dromara.mall.domain.vo.MallDiyPcTemplatePageVo;
+import org.dromara.mall.domain.MallDiyPcTemplatePage;
+import org.dromara.mall.mapper.MallDiyPcTemplatePageMapper;
+import org.dromara.mall.service.IMallDiyPcTemplatePageService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * pc装修页面模版Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-03-07
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MallDiyPcTemplatePageServiceImpl  extends ServiceImpl<MallDiyPcTemplatePageMapper, MallDiyPcTemplatePage> implements IMallDiyPcTemplatePageService {
+
+    private final MallDiyPcTemplatePageMapper baseMapper;
+
+    /**
+     * 查询pc装修页面模版
+     *
+     * @param id 主键
+     * @return pc装修页面模版
+     */
+    @Override
+    public MallDiyPcTemplatePageVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询pc装修页面模版列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return pc装修页面模版分页列表
+     */
+    @Override
+    public TableDataInfo<MallDiyPcTemplatePageVo> queryPageList(MallDiyPcTemplatePageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallDiyPcTemplatePage> lqw = buildQueryWrapper(bo);
+        Page<MallDiyPcTemplatePageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的pc装修页面模版列表
+     *
+     * @param bo 查询条件
+     * @return pc装修页面模版列表
+     */
+    @Override
+    public List<MallDiyPcTemplatePageVo> queryList(MallDiyPcTemplatePageBo bo) {
+        LambdaQueryWrapper<MallDiyPcTemplatePage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallDiyPcTemplatePage> buildQueryWrapper(MallDiyPcTemplatePageBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<MallDiyPcTemplatePage> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(MallDiyPcTemplatePage::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallDiyPcTemplatePage::getName, bo.getName());
+        lqw.eq(bo.getSiteId() != null, MallDiyPcTemplatePage::getSiteId, bo.getSiteId());
+        lqw.eq(bo.getClientId() != null, MallDiyPcTemplatePage::getClientId, bo.getClientId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), MallDiyPcTemplatePage::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPreviewPicUrls()), MallDiyPcTemplatePage::getPreviewPicUrls, bo.getPreviewPicUrls());
+        lqw.eq(StringUtils.isNotBlank(bo.getProperty()), MallDiyPcTemplatePage::getProperty, bo.getProperty());
+        lqw.eq(bo.getIsHome() != null, MallDiyPcTemplatePage::getIsHome, bo.getIsHome());
+        return lqw;
+    }
+
+    /**
+     * 新增pc装修页面模版
+     *
+     * @param bo pc装修页面模版
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(MallDiyPcTemplatePageBo bo) {
+        MallDiyPcTemplatePage add = MapstructUtils.convert(bo, MallDiyPcTemplatePage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改pc装修页面模版
+     *
+     * @param bo pc装修页面模版
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(MallDiyPcTemplatePageBo bo) {
+        MallDiyPcTemplatePage update = MapstructUtils.convert(bo, MallDiyPcTemplatePage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallDiyPcTemplatePage entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除pc装修页面模版信息
+     *
+     * @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-mall/src/main/resources/mapper/mall/MallDiyPcPageMapper.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.mall.mapper.MallDiyPcPageMapper">
+
+</mapper>

+ 7 - 0
ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/MallDiyPcTemplatePageMapper.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.mall.mapper.MallDiyPcTemplatePageMapper">
+
+</mapper>

+ 89 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ClientSiteProductExportVo.java

@@ -0,0 +1,89 @@
+package org.dromara.product.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 客户站点产品导出对象
+ *
+ * @author LionLi
+ * @date 2026-03-06
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ClientSiteProductExportVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @ExcelProperty(value = "序号", index = 0)
+    private Integer serialNumber;
+
+    /**
+     * 商品编号
+     */
+    @ExcelProperty(value = "商品编号", index = 1)
+    private String productNo;
+
+    /**
+     * 商品名称
+     */
+    @ExcelProperty(value = "商品名称", index = 2)
+    private String itemName;
+
+    /**
+     * 商品类别
+     */
+    @ExcelProperty(value = "商品类别", index = 3)
+    private String categoryName;
+
+    /**
+     * 商品品牌
+     */
+    @ExcelProperty(value = "商品品牌", index = 4)
+    private String brandName;
+
+    /**
+     * 商品单位
+     */
+    @ExcelProperty(value = "商品单位", index = 5)
+    private String unitName;
+
+    /**
+     * 市场价
+     */
+    @ExcelProperty(value = "市场价", index = 6)
+    private BigDecimal marketPrice;
+
+    /**
+     * 平台售价
+     */
+    @ExcelProperty(value = "平台售价", index = 7)
+    private BigDecimal platformPrice;
+
+    /**
+     * 最低售价
+     */
+    @ExcelProperty(value = "最低售价", index = 8)
+    private BigDecimal minSellingPrice;
+
+    /**
+     * 采购价
+     */
+    @ExcelProperty(value = "采购价", index = 9)
+    private BigDecimal purchasingPrice;
+
+    /**
+     * 协议价
+     */
+    @ExcelProperty(value = "协议价", index = 10)
+    private BigDecimal agreementPrice;
+}