feat(product): 添加采购方案收藏功能并优化浏览记录和购物车功能

- 新增采购方案收藏相关实体、服务和控制器
- 重构商品浏览记录功能，返回Map格式数据
- 添加购物车商品数量统计功能
- 优化搜索功能支持按商品编号搜索
- 添加商品多图字段并完善排序功能
- 移除全局CORS配置类
- 调整Satoken配置启用Cookie鉴权
- 完善采购方案发布时间和分类字段处理

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -84,6 +85,7 @@ public class TableDataInfo<T> implements Serializable {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
         rspData.setMsg("查询成功");
+        rspData.setRows(new ArrayList<>());
         return rspData;
     }
 

ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml

@@ -8,7 +8,7 @@ sa-token:
   # 允许从 header 读取 token
   is-read-header: true
   # 关闭 cookie 鉴权 从根源杜绝 csrf 漏洞风险
-  is-read-cookie: false
+  is-read-cookie: true
   # token前缀
   token-prefix: "Bearer"
   cookie:

ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsConfig.java

@@ -1,27 +0,0 @@
-package org.dromara.gateway.filter;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.reactive.CorsWebFilter;
-import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-
-@Configuration
-public class GlobalCorsConfig {
-
-    @Bean
-    public CorsWebFilter corsWebFilter() {
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true); // 【关键】
-
-        // 添加允许的源 (生产环境建议动态获取或配置列表)
-        config.addAllowedOriginPattern("https://*.xiaoluwebsite.xyz");
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", config);
-
-        return new CorsWebFilter(source);
-    }
-}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/pc/PcOrderController.java

@@ -360,7 +360,7 @@ public class PcOrderController extends BaseController {
                 orderCustomerFlowService.initOrderFlow(orderId);
                 if(bo.getPlaceOrderType() == 1){
                     // 成功下单后，删除对应的购物车项
-                    remoteProductShoppingCartService.deleteWithValidByIds(productShoppingCartIds);
+                    remoteProductShoppingCartService.deleteWithValidByIds(bo.getProductShoppingCartId());
                 }
             } else {
                 throw new RuntimeException("订单创建失败");

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

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

@@ -2,6 +2,7 @@ package org.dromara.product.controller;
 
 import java.util.List;
 
+import cn.hutool.core.date.DateUtil;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -77,6 +78,7 @@ public class ProcurementTopicsController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ProcurementTopicsBo bo) {
+        bo.setReleaseTime(DateUtil.date());
         return toAjax(procurementTopicsService.insertByBo(bo));
     }
 

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

@@ -10,10 +10,7 @@ import org.dromara.product.domain.bo.*;
 import org.dromara.product.domain.vo.*;
 import org.dromara.product.service.*;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -102,8 +99,7 @@ public class IndexProductController {
      * 查询产品分类树
      * */
     @GetMapping("getProductCategoryTree")
-    public R<List<Tree<Long>>> getProductCategoryTree() {
-        ProductCategoryBo bo = new ProductCategoryBo();
+    public R<List<Tree<Long>>> getProductCategoryTree(ProductCategoryBo bo) {
         bo.setDataSource("youyi");
         return R.ok(productCategoryService.selectCategoryTreeList(bo));
     }

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

@@ -7,11 +7,13 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.product.domain.ProductBrowsingHistory;
 import org.dromara.product.domain.ProductCollect;
 import org.dromara.product.domain.ProductFavorites;
 import org.dromara.product.domain.ProductShoppingCart;
 import org.dromara.product.domain.bo.*;
 import org.dromara.product.domain.vo.PcProductVo;
+import org.dromara.product.domain.vo.ProcurementProgramVo;
 import org.dromara.product.domain.vo.ProductFavoritesVo;
 import org.dromara.product.service.*;
 import org.springframework.validation.annotation.Validated;
@@ -19,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 我的商品相关接口
@@ -41,6 +45,10 @@ public class MyProductController {
     private final IProductFavoritesService productFavoritesService;
     //购物车
     private final IProductShoppingCartService productShoppingCartService;
+    //采购方案
+    private final IProcurementProgramService procurementProgramService;
+    //采购方案收藏
+    private final IProcurementProgramCollectService procurementProgramCollectService;
 
 
     /**
@@ -49,6 +57,9 @@ public class MyProductController {
     @PostMapping("/addProductBrowsingHistory/{productId}")
     public R addProductBrowsingHistory(@PathVariable Long productId) {
         ProductBrowsingHistoryBo productBrowsingHistoryBo = new ProductBrowsingHistoryBo();
+        productBrowsingHistoryBo.setProductId(productId);
+        productBrowsingHistoryBo.setUserId(LoginHelper.getUserId());
+        productBrowsingHistoryBo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
         productBrowsingHistoryService.insertByBo(productBrowsingHistoryBo);
         return R.ok();
     }
@@ -58,16 +69,19 @@ public class MyProductController {
     * */
     @DeleteMapping("/deleteProductBrowsingHistory/{ids}")
     public R deleteProductBrowsingHistory(@PathVariable Long[] ids) {
-        productBrowsingHistoryService.deleteWithValidByIds(Arrays.asList(ids), false);
+        productBrowsingHistoryService.remove(Wrappers.lambdaQuery(ProductBrowsingHistory.class)
+            .in(ProductBrowsingHistory::getProductId, ids)
+            .eq(ProductBrowsingHistory::getUserId, LoginHelper.getUserId())
+        );
         return R.ok();
     }
 
     /**
     * 浏览记录的商品
     * */
-    @GetMapping("/getProductBrowsingHistoryPage")
-    public TableDataInfo<PcProductVo> getProductBrowsingHistoryPage(PageQuery pageQuery) {
-        return productBaseService.getProductBrowsingHistoryPage(LoginHelper.getUserId(),pageQuery);
+    @GetMapping("/getProductBrowsingHistory")
+    public R<Map<String,List<PcProductVo>>> getProductBrowsingHistory() {
+        return R.ok(productBaseService.getProductBrowsingHistory(LoginHelper.getUserId()));
     }
 
     /**
@@ -76,6 +90,7 @@ public class MyProductController {
     @PostMapping("/addProductFavorites")
     public R addProductFavorites(@RequestBody ProductFavoritesBo bo) {
         bo.setUserId(LoginHelper.getUserId());
+        bo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
         productFavoritesService.insertByBo(bo);
         return R.ok();
     }
@@ -114,6 +129,7 @@ public class MyProductController {
             if(one == null){
                 one = new ProductFavorites();
                 one.setUserId(LoginHelper.getUserId());
+                one.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
                 one.setTitle("默认收藏夹");
                 one.setIsDefault("0");
                 productFavoritesService.save(one);
@@ -121,7 +137,7 @@ public class MyProductController {
             bo.setFavoritesId(one.getId());
         }
         bo.setUserId(LoginHelper.getUserId());
-
+        bo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
         productCollectService.insertByBo(bo);
         return R.ok();
     }
@@ -198,6 +214,16 @@ public class MyProductController {
     public TableDataInfo<PcProductVo> getProductShoppingCartPage(String id, PageQuery pageQuery) {
         return productBaseService.getProductShoppingCartPage(id,LoginHelper.getUserId(),pageQuery);
     }
+
+    /**
+    * 获取购物车商品未失效的商品数量
+    * */
+    @GetMapping("/getProductShoppingCartCount")
+    public R getProductShoppingCartCount() {
+        return R.ok(productBaseService.getProductShoppingCartCount(LoginHelper.getUserId(), 0));
+    }
+
+
     /**
     * 协议供货商品列表
     * */
@@ -207,12 +233,28 @@ public class MyProductController {
         return productBaseService.getProtocolProductsPage(bo,pageQuery);
     }
 
-
-
-
-
-
-
-
+    /**
+    * 获取采购方案
+    * */
+    @GetMapping("/getProcurementProgramProductPage")
+    public TableDataInfo<ProcurementProgramVo> getProcurementProgramProductPage(ProcurementProgramBo bo, PageQuery pageQuery) {
+        if(Objects.equals(bo.getType(), "1")){
+            return procurementProgramService.queryPageList(bo,pageQuery);
+        }else if(Objects.equals(bo.getType(), "2")){
+            return TableDataInfo.build();
+        }else {
+            return TableDataInfo.build();
+        }
+    }
+    /**
+    * 收藏采购方案
+    * */
+    @PostMapping("/addProcurementProgramCollect")
+    public R addProcurementProgramCollect(@RequestBody ProcurementProgramCollectBo bo) {
+        bo.setUserId(LoginHelper.getUserId());
+        bo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
+        procurementProgramCollectService.insertByBo(bo);
+        return R.ok();
+    }
 
 }

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

@@ -0,0 +1,51 @@
+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;
+
+/**
+ * 客户收藏方案列对象 procurement_program_collect
+ *
+ * @author LionLi
+ * @date 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("procurement_program_collect")
+public class ProcurementProgramCollect extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 方案id
+     */
+    private Long programId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -37,6 +37,16 @@ public class ProductDecorationFloorLink extends TenantEntity {
      */
     private String productNo;
 
+    /**
+     * 楼层Id
+     */
+    private Long floorId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
     /**
      * 商品折扣
      */

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

@@ -52,6 +52,9 @@ public class ProductIndustrialFloorLink extends TenantEntity {
      */
     private String brandNo;
 
+
+    private Long brandId;
+
     /**
      * 排序
      */

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

@@ -19,6 +19,10 @@ public class PcProductBo {
     * */
     private String productNo;
     /**
+    * 商品名称
+    * */
+    private String itemName;
+    /**
     * 客户id
     * */
     private Long customerId;
@@ -33,7 +37,7 @@ public class PcProductBo {
     /**
     * 中级分类id
     * */
-    private Long middleCategoryId;
+    private Long mediumCategoryId;
     /**
     * 底层分类id
     * */

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

@@ -131,5 +131,10 @@ public class ProcurementProgramBo extends BaseEntity {
     //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+     * 类型 1采购方案 2专属采购方案 3收藏的采购方案
+     */
+    private String type;
+
 
 }

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

@@ -0,0 +1,53 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProcurementProgramCollect;
+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.*;
+
+/**
+ * 客户收藏方案列业务对象 procurement_program_collect
+ *
+ * @author LionLi
+ * @date 2026-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProcurementProgramCollect.class, reverseConvertGenerate = false)
+public class ProcurementProgramCollectBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 方案id
+     */
+    //@NotNull(message = "方案id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long programId;
+
+    /**
+     * 用户id
+     */
+    //@NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 客户id
+     */
+    //@NotNull(message = "客户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long customerId;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.product.domain.bo;
 
+import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.product.domain.ProductBase;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -342,4 +343,10 @@ public class ProductBaseBo extends BaseEntity {
     * */
     private String shelfComments;
 
+    /**
+     * 商品多图
+     * */
+    private String imageUrl;
+
+
 }

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

@@ -29,6 +29,11 @@ public class ProductBrandBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 平台编号
+     */
+    private String ids;
+
     /**
      * 品牌编号（唯一标识）
      */

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

@@ -36,6 +36,16 @@ public class ProductDecorationFloorLinkBo extends BaseEntity {
 //    @NotBlank(message = "商品编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String productNo;
 
+    /**
+     * 楼层Id
+     */
+    private Long floorId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
     /**
      * 商品折扣
      */

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

@@ -47,6 +47,8 @@ public class ProductIndustrialFloorLinkBo extends BaseEntity {
 //    @NotBlank(message = "商品编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String productNo;
 
+    private Long brandId;
+
     /**
      * 品牌编号
      */

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

@@ -11,6 +11,8 @@ import jakarta.validation.constraints.*;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 
+import java.util.List;
+
 /**
  * 产品解决方案/项目方案业务对象 product_program
  *
@@ -91,5 +93,10 @@ public class ProductProgramBo extends BaseEntity {
     //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+    * 多个产品id
+    * */
+    private List<Long> productIds;
+
 
 }

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

@@ -79,4 +79,9 @@ public class PcProductVo {
     * */
     private Long shoppingCartId;
 
+    /**
+    * 创建时间
+    * */
+    private String createTime;
+
 }

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

@@ -0,0 +1,62 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProcurementProgramCollect;
+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;
+
+
+
+/**
+ * 客户收藏方案列视图对象 procurement_program_collect
+ *
+ * @author LionLi
+ * @date 2026-03-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProcurementProgramCollect.class)
+public class ProcurementProgramCollectVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 方案id
+     */
+    @ExcelProperty(value = "方案id")
+    private Long programId;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 客户id
+     */
+    @ExcelProperty(value = "客户id")
+    private Long customerId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -376,6 +376,12 @@ public class ProductBaseVo implements Serializable {
     @ExcelProperty(value = "采购人员")
     private String purchasingPersonnel;
 
+    /**
+    * 商品多图
+    * */
+    @ExcelProperty(value = "商品多图")
+    private String imageUrl;
+
     /**
      * 商品详情 - 电脑端
      */

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

@@ -29,7 +29,7 @@ public class ProductBrowsingHistoryVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
@@ -58,5 +58,11 @@ public class ProductBrowsingHistoryVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+    * 创建时间
+    * */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
 
 }

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

@@ -43,9 +43,18 @@ public class ProductDecorationFloorLinkVo implements Serializable {
     /**
      * 商品编号
      */
-    @ExcelProperty(value = "商品编号")
     private String productNo;
 
+    /**
+     * 楼层Id
+     */
+    private Long floorId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
     /**
      * 商品折扣
      */

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

@@ -80,6 +80,9 @@ public class ProductIndustrialFloorLinkVo implements Serializable {
     @ExcelProperty(value = "品牌编号")
     private String brandNo;
 
+
+    private Long brandId;
+
     /**
      * 排序
      */

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

@@ -13,7 +13,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -118,5 +118,8 @@ public class ProductProgramVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 多个产品id
+     * */
+    private List<Long> productIds;
 }

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

@@ -59,6 +59,12 @@ public class ServiceCaseVo implements Serializable {
     @ExcelProperty(value = "项目类型")
     private String projectType;
 
+    /**
+    * 项目类型名称
+    * */
+    private String projectTypeName;
+
+
     /**
      * 上传方案
      */
@@ -105,4 +111,10 @@ public class ServiceCaseVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /*
+    * 创建时间
+    * */
+    @ExcelProperty(value = "创建时间")
+    private String createTime;
+
 }

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

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProcurementProgramCollect;
+import org.dromara.product.domain.vo.ProcurementProgramCollectVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 客户收藏方案列Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-03-03
+ */
+public interface ProcurementProgramCollectMapper extends BaseMapperPlus<ProcurementProgramCollect, ProcurementProgramCollectVo> {
+
+}

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

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

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

@@ -9,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 产品基础信息Service接口
@@ -158,7 +159,7 @@ public interface IProductBaseService extends IService<ProductBase>{
     /**
     * PC端商品浏览记录
     * */
-    TableDataInfo<PcProductVo> getProductBrowsingHistoryPage(Long userId,PageQuery pageQuery);
+    Map<String,List<PcProductVo>> getProductBrowsingHistory(Long userId);
 
     /**
     * PC端商品收藏夹
@@ -175,6 +176,11 @@ public interface IProductBaseService extends IService<ProductBase>{
     * */
     TableDataInfo<PcProductVo> getProductShoppingCartPage(String id,Long userId, PageQuery pageQuery);
 
+    /**
+    * PC端商品购物车数量
+    * */
+    Long getProductShoppingCartCount(Long userId,Integer isShow);
+
     /**
     * PC端轮播图商品列表
     * */

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

@@ -67,4 +67,6 @@ public interface IProductShoppingCartService extends IService<ProductShoppingCar
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
 }

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

@@ -0,0 +1,136 @@
+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.ProcurementProgramCollectBo;
+import org.dromara.product.domain.vo.ProcurementProgramCollectVo;
+import org.dromara.product.domain.ProcurementProgramCollect;
+import org.dromara.product.mapper.ProcurementProgramCollectMapper;
+import org.dromara.product.service.IProcurementProgramCollectService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 客户收藏方案列Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-03-03
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProcurementProgramCollectServiceImpl  extends ServiceImpl<ProcurementProgramCollectMapper, ProcurementProgramCollect> implements IProcurementProgramCollectService {
+
+    private final ProcurementProgramCollectMapper baseMapper;
+
+    /**
+     * 查询客户收藏方案列
+     *
+     * @param id 主键
+     * @return 客户收藏方案列
+     */
+    @Override
+    public ProcurementProgramCollectVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询客户收藏方案列列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客户收藏方案列分页列表
+     */
+    @Override
+    public TableDataInfo<ProcurementProgramCollectVo> queryPageList(ProcurementProgramCollectBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProcurementProgramCollect> lqw = buildQueryWrapper(bo);
+        Page<ProcurementProgramCollectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的客户收藏方案列列表
+     *
+     * @param bo 查询条件
+     * @return 客户收藏方案列列表
+     */
+    @Override
+    public List<ProcurementProgramCollectVo> queryList(ProcurementProgramCollectBo bo) {
+        LambdaQueryWrapper<ProcurementProgramCollect> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProcurementProgramCollect> buildQueryWrapper(ProcurementProgramCollectBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProcurementProgramCollect> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProcurementProgramCollect::getId);
+        lqw.eq(bo.getProgramId() != null, ProcurementProgramCollect::getProgramId, bo.getProgramId());
+        lqw.eq(bo.getUserId() != null, ProcurementProgramCollect::getUserId, bo.getUserId());
+        lqw.eq(bo.getCustomerId() != null, ProcurementProgramCollect::getCustomerId, bo.getCustomerId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProcurementProgramCollect::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增客户收藏方案列
+     *
+     * @param bo 客户收藏方案列
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProcurementProgramCollectBo bo) {
+        ProcurementProgramCollect add = MapstructUtils.convert(bo, ProcurementProgramCollect.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改客户收藏方案列
+     *
+     * @param bo 客户收藏方案列
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProcurementProgramCollectBo bo) {
+        ProcurementProgramCollect update = MapstructUtils.convert(bo, ProcurementProgramCollect.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProcurementProgramCollect entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除客户收藏方案列信息
+     *
+     * @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/ProductBaseServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.product.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
@@ -113,6 +114,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     private final ProductRecommendLinkMapper productRecommendLinkMapper;
     //平台装修楼层商品
     private final ProductDecorationFloorLinkMapper decorationFloorLinkMapper;
+    //工业装修楼层
+    private final ProductIndustrialFloorLinkMapper industrialFloorLinkMapper;
     //协议商品
     private final ProtocolProductsMapper protocolProductsMapper;
 
@@ -345,6 +348,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         photosWrapper.eq(ProductPhotos::getProductId, id);
         ProductPhotos productPhotos = photosMapper.selectOne(photosWrapper);
         if(ObjectUtil.isNotEmpty(productPhotos)){
+            vo.setImageUrl(productPhotos.getImageUrl());
             vo.setPcDetail(productPhotos.getProductDetailsPc());
             vo.setMobileDetail(productPhotos.getProductDetailsApp());
         }
@@ -449,7 +453,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         log.info("执行数据库降级查询...");
 
         LambdaQueryWrapper<ProductBase> lqw = buildQueryWrapper(bo);
-//        Page<ProductBaseVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<ProductBaseVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
 
 //        log.info("数据库查询完成，总记录数: {}", page.getTotal());
         return TableDataInfo.build();
@@ -467,8 +471,9 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         return baseMapper.selectVoList(lqw);
     }
     private LambdaEsQueryWrapper<ProductBaseVo> buildEsQueryWrapper(ProductBaseBo bo) {
-        return new LambdaEsQueryWrapper<ProductBaseVo>()
+        LambdaEsQueryWrapper<ProductBaseVo> productBaseVoLambdaEsQueryWrapper = new LambdaEsQueryWrapper<ProductBaseVo>()
             .eq(ObjectUtil.isNotEmpty(bo.getProductNo()), ProductBaseVo::getProductNo, bo.getProductNo())
+
             .like(ObjectUtil.isNotEmpty(bo.getItemName()), ProductBaseVo::getItemName, bo.getItemName())
             .eq(bo.getBrandId() != null, ProductBaseVo::getBrandId, bo.getBrandId())
             .eq(bo.getTopCategoryId() != null, ProductBaseVo::getTopCategoryId, bo.getTopCategoryId())
@@ -479,8 +484,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             .eq(ObjectUtil.isNotEmpty(bo.getIsSelf()), ProductBaseVo::getIsSelf, bo.getIsSelf())
             .eq(ObjectUtil.isNotEmpty(bo.getProductReviewStatus()), ProductBaseVo::getProductReviewStatus, bo.getProductReviewStatus())
             .eq(ObjectUtil.isNotEmpty(bo.getDataSource()), ProductBaseVo::getDataSource, bo.getDataSource())
-            .orderByDesc(ProductBaseVo::getId)
-            ;
+            .orderByDesc(ProductBaseVo::getId);
+        if (ObjectUtil.isNotEmpty(bo.getIds())){
+            productBaseVoLambdaEsQueryWrapper.in(ProductBaseVo::getId, bo.getIds().split(","));
+        }
+
+
+        return productBaseVoLambdaEsQueryWrapper;
     }
 
     /**
@@ -499,8 +509,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         if (ObjectUtil.isNotEmpty(bo.getTopCategoryId())) {
             wrapper.eq(ProductBaseVo::getTopCategoryId, bo.getTopCategoryId());
         }
-        if (ObjectUtil.isNotEmpty(bo.getMiddleCategoryId())) {
-            wrapper.eq(ProductBaseVo::getMediumCategoryId, bo.getMiddleCategoryId());
+        if (ObjectUtil.isNotEmpty(bo.getMediumCategoryId())) {
+            wrapper.eq(ProductBaseVo::getMediumCategoryId, bo.getMediumCategoryId());
         }
         if (ObjectUtil.isNotEmpty(bo.getBottomCategoryId())) {
             wrapper.eq(ProductBaseVo::getBottomCategoryId, bo.getBottomCategoryId());
@@ -701,7 +711,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
 
             // 1. 更新产品基础信息
             ProductBase productBase = MapstructUtils.convert(bo, ProductBase.class);
-            validEntityBeforeSave(productBase);
+//            validEntityBeforeSave(productBase);
 
             boolean flag = baseMapper.updateById(productBase) > 0;
             if (!flag) {
@@ -1354,7 +1364,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             try {
                 LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = new LambdaEsQueryWrapper<ProductBaseVo>()
                     .in(ProductBaseVo::getId, productIds)
-                    .eq(ProductBaseVo::getProductStatus, 1);
+//                    .eq(ProductBaseVo::getProductStatus, 1)
+                    ;
 
                 // 检查ES索引是否存在
                 if (!esMapper.existsIndex("productbasevo")) {
@@ -1398,7 +1409,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             try {
                 LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = new LambdaEsQueryWrapper<ProductBaseVo>()
                     .in(ProductBaseVo::getProductNo, productNos)
-                    .eq(ProductBaseVo::getProductStatus, 1);
+//                    .eq(ProductBaseVo::getProductStatus, 1)
+                    ;
 
                 // 检查ES索引是否存在
                 if (!esMapper.existsIndex("productbasevo")) {
@@ -1449,7 +1461,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         lqw.like(StringUtils.isNotBlank(bo.getProductNo()), "b.product_no", bo.getProductNo());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getBrandId()), "b.brand_id", bo.getBrandId());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getTopCategoryId()), "b.top_category_id", bo.getTopCategoryId());
-        lqw.eq(ObjectUtil.isNotEmpty(bo.getMiddleCategoryId()), "b.middle_category_id", bo.getMiddleCategoryId());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getMediumCategoryId()), "b.medium_category_id", bo.getMediumCategoryId());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getBottomCategoryId()), "b.bottom_category_id", bo.getBottomCategoryId());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getIsCustomize()), "e.is_customize", bo.getIsCustomize());
         if(bo.getPriceRange() != null){
@@ -1489,7 +1501,10 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             if (ObjectUtil.isNotEmpty(bo.getSearchKeyword())) {
                 esQueryWrapper.and(wrapper -> wrapper
                     .like(ProductBaseVo::getItemName, bo.getSearchKeyword())
-                    .or().like(ProductBaseVo::getBrandName, bo.getSearchKeyword())
+                    .or()
+                    .like(ProductBaseVo::getBrandName, bo.getSearchKeyword())
+                    .or()
+                    .like(ProductBaseVo::getProductNo, bo.getProductNo())
                 );
             }
 
@@ -1511,6 +1526,21 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
                 }
             }
 
+            if(bo.getSortField() != null && bo.getSortOrder() != null){
+                String[] sortFields = bo.getSortField().split(",");
+                String[] sortOrders = bo.getSortOrder().split(",");
+                for (int i = 0; i < sortFields.length; i++) {
+                    switch (sortFields[i]) {
+                        case "1":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getId);
+                        case "2":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getTotalInventory);
+                        case "3":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getMarketPrice);
+                    }
+                }
+            }
+
             // 检查ES索引是否存在
             if (!esMapper.existsIndex("productbasevo")) {
                 log.warn("ES索引 [productbasevo] 不存在，降级到数据库查询");
@@ -1539,32 +1569,27 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
      * @param userId
      */
     @Override
-    public TableDataInfo<PcProductVo> getProductBrowsingHistoryPage(Long userId, PageQuery pageQuery) {
+    public Map<String,List<PcProductVo>> getProductBrowsingHistory(Long userId) {
         List<ProductBrowsingHistoryVo> productBrowsingHistoryVos = productBrowsingHistoryMapper.selectVoList(Wrappers.lambdaQuery(ProductBrowsingHistory.class)
             .eq(ProductBrowsingHistory::getUserId, userId)
         );
         if (CollUtil.isNotEmpty(productBrowsingHistoryVos)) {
-            List<Long> productIds = productBrowsingHistoryVos.stream().map(ProductBrowsingHistoryVo::getProductId).toList();
-            //获取商品浏览记录
-            QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
-            lqw.in("b.id", productIds);
-            lqw.eq("b.product_status", 1);
-            int limit = pageQuery.getPageSize() + 1;
-            lqw.last("limit "+ limit );
-            List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
-            if (CollUtil.isNotEmpty(productBaseVos)) {
+            //将浏览记录通过创建时间的日分组
+            Map<String, List<ProductBrowsingHistoryVo>> collect =
+                productBrowsingHistoryVos.stream()
+                    .collect(Collectors.groupingBy(productBrowsingHistoryVo -> DateUtil.format(productBrowsingHistoryVo.getCreateTime(), "yyyy-MM-dd")));
+            //遍历构建PC端商品浏览记录
+            return collect.entrySet().stream().map(entry -> {
+                List<Long> productIds = entry.getValue().stream().map(ProductBrowsingHistoryVo::getProductId).distinct().toList();
+                QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
+                lqw.in("b.id", productIds);
+                List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
                 List<PcProductVo> pcProductVos = BeanUtil.copyToList(productBaseVos, PcProductVo.class);
-                int size = pcProductVos.size();
-                if (size > pageQuery.getPageSize()) {
-                    pcProductVos.remove(pcProductVos.size() - 1);
-                }
-                TableDataInfo<PcProductVo> tableDataInfo = TableDataInfo.build(pcProductVos);
-                tableDataInfo.setTotal(size);
-                return tableDataInfo;
-            }
+                return Map.entry(entry.getKey(), pcProductVos);
+            }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         }
 
-        return TableDataInfo.build();
+        return Map.of();
     }
 
     /**
@@ -1577,7 +1602,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     public TableDataInfo<PcProductVo> getFavoritesProductPage(Long favoritesId, Long userId, PageQuery pageQuery) {
         //获取收藏夹商品id
         List<ProductCollectVo> productFavoritesLinkVos = productCollectMapper.selectVoList(Wrappers.lambdaQuery(ProductCollect.class)
-            .eq(ProductCollect::getFavoritesId, favoritesId)
+            .eq(ObjectUtil.isNotEmpty(favoritesId),ProductCollect::getFavoritesId, favoritesId)
             .eq(ProductCollect::getUserId, userId)
         );
         if (CollUtil.isNotEmpty(productFavoritesLinkVos)) {
@@ -1585,7 +1610,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             //获取收藏夹商品
             QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
             lqw.in("b.id", productIds);
-            lqw.eq("b.product_status", 1);
+//            lqw.eq("b.product_status", 1);
             int limit = pageQuery.getPageSize() + 1;
             lqw.last("limit "+ limit );
             List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
@@ -1670,6 +1695,30 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         return TableDataInfo.build();
     }
 
+    /**
+     * PC端商品购物车数量
+     *
+     * @param userId
+     * @param isShow
+     */
+    @Override
+    public Long getProductShoppingCartCount(Long userId, Integer isShow) {
+        if (ObjectUtil.isNotNull(userId)) {
+            List<ProductShoppingCartVo> productShoppingCartVos = productShoppingCartMapper.selectVoList(Wrappers.lambdaQuery(ProductShoppingCart.class)
+                .eq(ProductShoppingCart::getUserId, userId)
+            );
+            if (CollUtil.isEmpty(productShoppingCartVos)){
+                return 0L;
+            }
+            Long count = baseMapper.selectCount(Wrappers.lambdaQuery(ProductBase.class)
+                .in(ProductBase::getId, productShoppingCartVos.stream().map(ProductShoppingCartVo::getProductId).toList())
+                .eq(ProductBase::getProductStatus, 1)
+            );
+            return count;
+        }
+        return 0L;
+    }
+
     /**
      * PC端轮播图商品列表
      */
@@ -1701,13 +1750,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     public List<PcProductVo> getRecommendedCategoryProductList(Long categoryId) {
         List<ProductCategoryRecommendedLinkVo> productCategoryRecommendedLinkVos = productCategoryRecommendedLinkMapper.selectVoList(
                 Wrappers.lambdaQuery(ProductCategoryRecommendedLink.class)
-                    .eq(ProductCategoryRecommendedLink::getCategoryId, categoryId)
+                    .eq(ObjectUtil.isNotEmpty(categoryId),ProductCategoryRecommendedLink::getCategoryId, categoryId)
             );
             if (CollUtil.isNotEmpty(productCategoryRecommendedLinkVos)) {
                 List<Long> productIds = productCategoryRecommendedLinkVos.stream().map(ProductCategoryRecommendedLinkVo::getProductId).toList();
                 QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
                 lqw.in("b.id", productIds);
-                lqw.eq("b.product_status", 1);
+//                lqw.eq("b.product_status", 1);
                 List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
                 if (CollUtil.isNotEmpty(productBaseVos)) {
                     return BeanUtil.copyToList(productBaseVos, PcProductVo.class);
@@ -1723,15 +1772,15 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
      */
     @Override
     public List<PcProductVo> getIndustrialFloorProductList(Long floorId) {
-        List<ProductDecorationFloorLinkVo> productDecorationFloorLinkVos = decorationFloorLinkMapper.selectVoList(
-                Wrappers.lambdaQuery(ProductDecorationFloorLink.class)
-                    .eq(ProductDecorationFloorLink::getFloorNo, floorId)
+        List<ProductIndustrialFloorLinkVo> productIndustrialFloorLinkVos = industrialFloorLinkMapper.selectVoList(
+                Wrappers.lambdaQuery(ProductIndustrialFloorLink.class)
+                    .eq(ProductIndustrialFloorLink::getFloorId, floorId)
             );
-        if (CollUtil.isNotEmpty(productDecorationFloorLinkVos)) {
-            List<String> productNos = productDecorationFloorLinkVos.stream().map(ProductDecorationFloorLinkVo::getProductNo).toList();
+        if (CollUtil.isNotEmpty(productIndustrialFloorLinkVos)) {
+            List<Long> productIds = productIndustrialFloorLinkVos.stream().map(ProductIndustrialFloorLinkVo::getProductId).toList();
             QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
-            lqw.in("b.product_no", productNos);
-            lqw.eq("b.product_status", 1);
+            lqw.in("b.id", productIds);
+//            lqw.eq("b.product_status", 1);
             List<ProductBaseVo> productBaseVos = baseMapper.selectAllList(lqw);
             if (CollUtil.isNotEmpty(productBaseVos)) {
                 return BeanUtil.copyToList(productBaseVos, PcProductVo.class);
@@ -1783,7 +1832,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
                 try {
                     LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = new LambdaEsQueryWrapper<ProductBaseVo>()
                         .in(ProductBaseVo::getId, productIds)
-                        .eq(ProductBaseVo::getProductStatus, 1);
+//                        .eq(ProductBaseVo::getProductStatus, 1)
+                        ;
 
                     // 检查ES索引是否存在
                     if (!esMapper.existsIndex("productbasevo")) {
@@ -1870,10 +1920,48 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             .le(ObjectUtil.isNotEmpty(bo.getMaxPrice()), ProtocolProducts::getAgreementPrice, bo.getMaxPrice())
         );
         if (CollUtil.isNotEmpty(protocolProductsVos)) {
-            LambdaEsQueryWrapper<ProductBaseVo> wrapper = new LambdaEsQueryWrapper<ProductBaseVo>();
+            LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = new LambdaEsQueryWrapper<ProductBaseVo>();
 //            wrapper.eq(ProductBaseVo::getProductStatus, 1);
-            wrapper.in(ProductBaseVo::getId, protocolProductsVos.stream().map(ProtocolProductsVo::getProductId).toList());
-            EsPageInfo<ProductBaseVo> esPageInfo = esMapper.pageQuery(wrapper, pageQuery.getPageNum(), pageQuery.getPageSize());
+            esQueryWrapper.in(ProductBaseVo::getId, protocolProductsVos.stream().map(ProtocolProductsVo::getProductId).toList());
+            // 添加额外的查询条件
+            esQueryWrapper.like(ObjectUtil.isNotEmpty(bo.getItemName()),ProductBaseVo::getItemName,bo.getItemName());
+            esQueryWrapper.eq(ObjectUtil.isNotEmpty(bo.getProductNo()),ProductBaseVo::getProductNo,bo.getProductNo());
+            esQueryWrapper.eq(ObjectUtil.isNotEmpty(bo.getTopCategoryId()),ProductBaseVo::getTopCategoryId,bo.getTopCategoryId());
+            esQueryWrapper.eq(ObjectUtil.isNotEmpty(bo.getMediumCategoryId()),ProductBaseVo::getMediumCategoryId,bo.getMediumCategoryId());
+            esQueryWrapper.eq(ObjectUtil.isNotEmpty(bo.getBottomCategoryId()),ProductBaseVo::getBottomCategoryId,bo.getBottomCategoryId());
+            if (bo.getPriceRange() != null) {
+                //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
+                switch (bo.getPriceRange()) {
+                    case "1":
+                        esQueryWrapper.between(ProductBaseVo::getMarketPrice, 1, 100);
+                        break;
+                    case "2":
+                        esQueryWrapper.between(ProductBaseVo::getMarketPrice, 100, 500);
+                        break;
+                    case "3":
+                        esQueryWrapper.between(ProductBaseVo::getMarketPrice, 500, 1000);
+                        break;
+                    case "4":
+                        esQueryWrapper.ge(ProductBaseVo::getMarketPrice, 1000);
+                        break;
+                }
+            }
+
+            if(bo.getSortField() != null && bo.getSortOrder() != null){
+                String[] sortFields = bo.getSortField().split(",");
+                String[] sortOrders = bo.getSortOrder().split(",");
+                for (int i = 0; i < sortFields.length; i++) {
+                    switch (sortFields[i]) {
+                        case "1":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getId);
+                        case "2":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getTotalInventory);
+                        case "3":
+                            esQueryWrapper.orderBy( true, sortOrders[i].equals("Asc"),ProductBaseVo::getMarketPrice);
+                    }
+                }
+            }
+            EsPageInfo<ProductBaseVo> esPageInfo = esMapper.pageQuery(esQueryWrapper, pageQuery.getPageNum(), pageQuery.getPageSize());
             List<PcProductVo> pcProductVos = BeanUtil.copyToList(esPageInfo.getList(), PcProductVo.class);
             TableDataInfo<PcProductVo> build = TableDataInfo.build(pcProductVos);
             build.getRows().forEach(pcProductVo -> {
@@ -1903,8 +1991,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             if (ObjectUtil.isNotEmpty(bo.getTopCategoryId())) {
                 wrapper.eq(ProductBaseVo::getTopCategoryId, bo.getTopCategoryId());
             }
-            if (ObjectUtil.isNotEmpty(bo.getMiddleCategoryId())) {
-                wrapper.eq(ProductBaseVo::getMediumCategoryId, bo.getMiddleCategoryId());
+            if (ObjectUtil.isNotEmpty(bo.getMediumCategoryId())) {
+                wrapper.eq(ProductBaseVo::getMediumCategoryId, bo.getMediumCategoryId());
             }
             if (ObjectUtil.isNotEmpty(bo.getBottomCategoryId())) {
                 wrapper.eq(ProductBaseVo::getBottomCategoryId, bo.getBottomCategoryId());

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

@@ -100,6 +100,9 @@ public class ProductBrandServiceImpl  extends ServiceImpl<ProductBrandMapper, Pr
     @Override
     public TableDataInfo<ProductBrandVo> queryPageList(ProductBrandBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ProductBrand> lqw = buildQueryWrapper(bo);
+        if(ObjectUtil.isNotEmpty( bo.getIds())){
+            lqw.in(ProductBrand::getId, bo.getIds().split(","));
+        }
         Page<ProductBrandVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }

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

@@ -1,5 +1,6 @@
 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.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -10,6 +11,8 @@ 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.product.domain.ProductProgramLink;
+import org.dromara.product.mapper.ProductProgramLinkMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.product.domain.bo.ProductProgramBo;
 import org.dromara.product.domain.vo.ProductProgramVo;
@@ -34,6 +37,8 @@ public class ProductProgramServiceImpl  extends ServiceImpl<ProductProgramMapper
 
     private final ProductProgramMapper baseMapper;
 
+    private final ProductProgramLinkMapper productProgramLinkMapper;
+
     /**
      * 查询产品解决方案/项目方案
      *
@@ -42,7 +47,14 @@ public class ProductProgramServiceImpl  extends ServiceImpl<ProductProgramMapper
      */
     @Override
     public ProductProgramVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        ProductProgramVo productProgramVo = baseMapper.selectVoById(id);
+        if (ObjectUtil.isNotNull(productProgramVo)) {
+            List<ProductProgramLink> productProgramLinks = productProgramLinkMapper.selectList(Wrappers.lambdaQuery(ProductProgramLink.class)
+                .eq(ProductProgramLink::getProgramId, id)
+            );
+            productProgramVo.setProductIds(productProgramLinks.stream().map(ProductProgramLink::getProductId).toList());
+        }
+        return productProgramVo;
     }
 
     /**
@@ -101,6 +113,9 @@ public class ProductProgramServiceImpl  extends ServiceImpl<ProductProgramMapper
         ProductProgram add = MapstructUtils.convert(bo, ProductProgram.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            insertProductProgramLink(bo.getProductIds(), add.getId());
+        }
         if (flag) {
             bo.setId(add.getId());
         }
@@ -117,9 +132,32 @@ public class ProductProgramServiceImpl  extends ServiceImpl<ProductProgramMapper
     public Boolean updateByBo(ProductProgramBo bo) {
         ProductProgram update = MapstructUtils.convert(bo, ProductProgram.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        boolean b = baseMapper.updateById(update) > 0;
+        if (b) {
+            insertProductProgramLink(bo.getProductIds(), bo.getId());
+        }
+        return b;
+    }
+
+    /**
+     * 批量新增产品关联
+     */
+    private void insertProductProgramLink(List<Long> productIds, Long programId){
+        productProgramLinkMapper.delete(Wrappers.lambdaQuery(ProductProgramLink.class)
+            .eq(ProductProgramLink::getProgramId, programId)
+        );
+        if(ObjectUtil.isNotEmpty(productIds)){
+            for (Long productId : productIds) {
+                ProductProgramLink productProgramLink = new ProductProgramLink();
+                productProgramLink.setProductId(productId);
+                productProgramLink.setProgramId(programId);
+                productProgramLinkMapper.insert(productProgramLink);
+            }
+        }
     }
 
+
+
     /**
      * 保存前的数据校验
      */

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductIndustrialFloorLinkMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l.product_id,
             l.product_no,
             l.brand_no,
+            l.brand_id,
             l.sort,
             l.status,
             l.remark,

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/pc/IndexSystemController.java

@@ -11,10 +11,7 @@ import org.dromara.system.domain.bo.SysAnnouncementBo;
 import org.dromara.system.domain.vo.SysAnnouncementVo;
 import org.dromara.system.service.*;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -24,6 +21,7 @@ import java.util.List;
  * @date 2026/1/29 下午3:31
  */
 @Validated
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/indexSystem")
@@ -223,6 +221,7 @@ public class IndexSystemController {
     public R<List<SysFloorAdvertise>> getClassificationFloorDetail(@PathVariable Long floorNo) {
         List<SysFloorAdvertise> list = sysFloorAdvertiseService.list(Wrappers.lambdaQuery(SysFloorAdvertise.class)
             .eq(SysFloorAdvertise::getFloorNo, floorNo)
+            .orderByAsc(SysFloorAdvertise::getSort)
         );
         return R.ok(list);
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/pc/IndustrySystemController.java

@@ -66,7 +66,7 @@ public class IndustrySystemController {
     public R<List<SysAdContent>> getBusinessLabelList() {
         List<SysAdContent> list = sysAdContentService.list(Wrappers.<SysAdContent>lambdaQuery(SysAdContent.class)
             .eq(SysAdContent::getAdType, "industrial_tag")
-            .eq(SysAdContent::getStatus, 1)
+//            .eq(SysAdContent::getStatus, 1)
         );
         return R.ok(list);
     }