feat(product): 新增商品分类绑定功能并优化售后服务处理

- 新增 ProductCategoryBinding 相关实体、BO、VO、Mapper 和 Service
- 实现商品分类绑定的增删改查和分页查询功能
- 添加 PC 端商品页面的企业商品池和大客户商品池逻辑
- 实现中车和同济的售后单查询差异处理
- 优化售后取消消息处理器的业务逻辑
- 移除品牌显示过滤条件并添加登录用户 PC 显示字段
- 修复客户端站点商品查询的条件注释问题
- 为 IndexProductController 添加产品属性服务依赖注入

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java

@@ -157,6 +157,13 @@ public class LoginUser implements Serializable {
      */
     private String openid;
 
+    /**
+    * pc端显示情况 0默认首页,1企业首页,2大客户首页
+    * */
+    private String pcDisplay;
+
+
+
     /**
      * 获取登录id
      */

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleApplyMessageHandler.java

@@ -1,5 +1,6 @@
 package org.dromara.external.handler.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +11,7 @@ import org.dromara.common.core.domain.zhongche.aftersale.domain.AfterSaleReason;
 import org.dromara.common.core.domain.zhongche.aftersale.vo.AfterSaleDetailVo;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
+import org.dromara.external.controller.tongji.TongJiPullController;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
 import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
@@ -31,6 +33,8 @@ public class AfterSaleApplyMessageHandler implements MallMessageHandler {
 
     private final ZhongChePullController zhongChePullController;
 
+    private final TongJiPullController tongJiPullController;
+
     private final RemoteExternalOrderService remoteExternalOrderService;
     @Override
     public MallMessageTypeEnum supportType() {
@@ -57,8 +61,16 @@ public class AfterSaleApplyMessageHandler implements MallMessageHandler {
         String afterSaleNo = (String) messageBo.getContent().get("afterSaleNo");
         AfterSaleDetailBo bo = new AfterSaleDetailBo();
         bo.setAfterSaleNo(afterSaleNo);
+        AfterSaleDetailVo afterSaleDetailVo = null;
         //查询售后单
-        AfterSaleDetailVo afterSaleDetailVo = zhongChePullController.mallAftersaleDetail(bo);
+        if("zhongche".equals(messageBo.getItemKey())){
+            afterSaleDetailVo = zhongChePullController.mallAftersaleDetail(bo);
+        }else if("tongji".equals(messageBo.getItemKey())){
+             afterSaleDetailVo = tongJiPullController.mallAftersaleDetail(bo);
+        }
+        if (ObjectUtil.isEmpty(afterSaleDetailVo)){
+            return new MessageVo("1","售后单不存在");
+        }
         OrderReturnDto orderReturnDto = remoteExternalOrderService.createReturnOrder(afterSaleDetailVo);
 
         if (orderReturnDto.getSuccess() == true){

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleCancelMessageHandler.java

@@ -30,7 +30,13 @@ public class AfterSaleCancelMessageHandler implements MallMessageHandler {
     @Override
     public MessageVo handle(MessageBo messageBo) {
         log.info("取消售后单:{}", JSONUtil.toJsonStr(messageBo));
-        return new MessageVo("1");
+        String afterSaleNo = (String) messageBo.getContent().get("afterSaleNo");
+        String cancelReason = (String) messageBo.getContent().get("cancelReason");
+        boolean b = remoteExternalOrderService.cancelReturnOrder(afterSaleNo, cancelReason);
+        if (b){
+            return new MessageVo("1");
+        }
+        return new MessageVo("0","取消订单失败");
     }
     /*@Override
     public MessageVo handle(MessageBo messageBo) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteExternalOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.idev.excel.event.Order;
 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.apache.dubbo.config.annotation.DubboReference;
@@ -629,6 +630,9 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
         orderReturn.setReturnStatus(convertAfterSaleStatus(afterSaleDetailVo.getAfterSaleStatus()));
 
         //售后金额
+        if (afterSaleDetailVo.getAfterSaleGoods() == null) {
+            throw new IllegalArgumentException("售后商品信息不能为空");
+        }
         ProductVo productDetail = remoteProductService.getProductDetail(Long.valueOf(afterSaleDetailVo.getAfterSaleGoods().getGoodsId()));
         BigDecimal afterSaleAmount = productDetail.getMemberPrice().multiply(afterSaleDetailVo.getAfterSaleGoods().getNum());
         afterSaleAmount = afterSaleAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -658,6 +662,13 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
                 .collect(Collectors.joining(",")); // 用逗号拼接
             orderReturn.setVoucherPhoto(images);
         }
+        //获取售后订单的主单id
+        OrderMainCrrcExt orderMainCrrcExt = orderMainCrrcExtService.getOne(Wrappers.lambdaQuery(OrderMainCrrcExt.class)
+            .eq(OrderMainCrrcExt::getCrrcOrderNo, afterSaleDetailVo.getOrderNo())
+        );
+        if (orderMainCrrcExt == null){
+            orderReturn.setOrderId(orderMainCrrcExt.getId());
+        }
         boolean orderReturnFlag = orderReturnService.save(orderReturn);
 
         //副标
@@ -704,8 +715,12 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
         OrderReturnItemCrrcExt orderReturnItemCrrcExt = new OrderReturnItemCrrcExt();
         //设置ID
         orderReturnItemCrrcExt.setReturnItemId(orderReturnItem.getId());
-        orderReturnItemCrrcExt.setNeedDetectionReport(Long.valueOf(afterSaleDetailVo.getAfterSaleGoods().getNeedDetectionReport()));
-        orderReturnItemCrrcExt.setHasPackage(Long.valueOf(afterSaleDetailVo.getAfterSaleGoods().getHasPackage()));
+        if (ObjectUtil.isNotEmpty(afterSaleDetailVo.getAfterSaleGoods().getNeedDetectionReport())) {
+            orderReturnItemCrrcExt.setNeedDetectionReport(Long.valueOf(afterSaleDetailVo.getAfterSaleGoods().getNeedDetectionReport()));
+        }
+        if (ObjectUtil.isNotEmpty(afterSaleDetailVo.getAfterSaleGoods().getHasPackage())) {
+            orderReturnItemCrrcExt.setHasPackage(Long.valueOf(afterSaleDetailVo.getAfterSaleGoods().getHasPackage()));
+        }
         orderReturnItemCrrcExt.setPackageDesc(afterSaleDetailVo.getAfterSaleGoods().getPackageDesc());
         boolean orderReturnItemCrrcExtFlag = orderReturnItemCrrcExtService.save(orderReturnItemCrrcExt);
 

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

@@ -144,7 +144,8 @@ public class ClientSiteProductController extends BaseController {
     @GetMapping("/getSiteProductPage")
     public TableDataInfo<ProductBaseVo> getSiteProductPage(ProductBaseBo bo, PageQuery pageQuery) {
         List<ClientSiteProduct> clientSiteProducts = clientSiteProductService.list(Wrappers.lambdaQuery(ClientSiteProduct.class)
-            .eq(ClientSiteProduct::getSiteId, bo.getSiteId()));
+//            .eq(ClientSiteProduct::getSiteId, bo.getSiteId())
+        );
         if (CollUtil.isEmpty(clientSiteProducts)) {
             return TableDataInfo.build();
         }

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

@@ -0,0 +1,116 @@
+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.dromara.product.domain.bo.ProductBaseBo;
+import org.dromara.product.domain.vo.ProductBaseVo;
+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.ProductCategoryBindingVo;
+import org.dromara.product.domain.bo.ProductCategoryBindingBo;
+import org.dromara.product.service.IProductCategoryBindingService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 其它分类与商品的绑定
+ * 前端访问路由地址为:/product/categoryBinding
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/categoryBinding")
+public class ProductCategoryBindingController extends BaseController {
+
+    private final IProductCategoryBindingService productCategoryBindingService;
+
+    /**
+     * 查询其它分类与商品的绑定列表
+     */
+    //@SaCheckPermission("product:categoryBinding:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProductCategoryBindingVo> list(ProductCategoryBindingBo bo, PageQuery pageQuery) {
+        return productCategoryBindingService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出其它分类与商品的绑定列表
+     */
+    //@SaCheckPermission("product:categoryBinding:export")
+    @Log(title = "其它分类与商品的绑定", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProductCategoryBindingBo bo, HttpServletResponse response) {
+        List<ProductCategoryBindingVo> list = productCategoryBindingService.queryList(bo);
+        ExcelUtil.exportExcel(list, "其它分类与商品的绑定", ProductCategoryBindingVo.class, response);
+    }
+
+    /**
+     * 获取其它分类与商品的绑定详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("product:categoryBinding:query")
+    @GetMapping("/{id}")
+    public R<ProductCategoryBindingVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(productCategoryBindingService.queryById(id));
+    }
+
+    /**
+     * 新增其它分类与商品的绑定
+     */
+    //@SaCheckPermission("product:categoryBinding:add")
+    @Log(title = "其它分类与商品的绑定", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProductCategoryBindingBo bo) {
+        return toAjax(productCategoryBindingService.insertByBo(bo));
+    }
+
+    /**
+     * 修改其它分类与商品的绑定
+     */
+    //@SaCheckPermission("product:categoryBinding:edit")
+    @Log(title = "其它分类与商品的绑定", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProductCategoryBindingBo bo) {
+        return toAjax(productCategoryBindingService.updateByBo(bo));
+    }
+
+    /**
+     * 删除其它分类与商品的绑定
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("product:categoryBinding:remove")
+    @Log(title = "其它分类与商品的绑定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(productCategoryBindingService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+    * 获取其他分类下关联的商品
+    * */
+    @GetMapping("/getCategoryBindingProductPage")
+    public TableDataInfo<ProductBaseVo> getCategoryBindingProductPage(ProductBaseBo bo, PageQuery pageQuery) {
+        return productCategoryBindingService.getCategoryBindingProductPage(bo, pageQuery);
+    }
+}

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

@@ -66,6 +66,8 @@ public class IndexProductController {
     private final IProcurementTopicsService procurementTopicsService;
     //特价商品
     private final IProductSpecialLinkService productSpecialLinkService;
+    //属性
+    private final IProductAttributesService productAttributeService;
     //商品es
     private final ProductEsMapper productEsMapper;
 

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

@@ -155,5 +155,10 @@ public class ProductCategory extends TenantEntity {
      */
     private Long reviewerId;
 
+    /**
+    * 客户id
+    * */
+    private Long customerId;
+
 
 }

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

@@ -0,0 +1,71 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 其它分类与商品的绑定对象 product_category_binding
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("product_category_binding")
+public class ProductCategoryBinding extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Long productId;
+
+    /**
+     * 商品编号
+     */
+    private String productNo;
+
+    /**
+     * 顶级分类id
+     */
+    private Long topCategoryId;
+
+    /**
+     * 中级分类id
+     */
+    private Long mediumCategoryId;
+
+    /**
+     * 低级分类id
+     */
+    private Long bottomCategoryId;
+
+    /**
+     * 所属平台 (0=平台,1=工业品,2=福利,3=企业购,4=大客户)
+     */
+    private Long platform;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,77 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProductCategoryBinding;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 其它分类与商品的绑定业务对象 product_category_binding
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductCategoryBinding.class, reverseConvertGenerate = false)
+public class ProductCategoryBindingBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    //@NotNull(message = "商品id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long productId;
+
+    /**
+     * 商品编号
+     */
+    //@NotBlank(message = "商品编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String productNo;
+
+    /**
+     * 顶级分类id
+     */
+    //@NotNull(message = "顶级分类id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long topCategoryId;
+
+    /**
+     * 中级分类id
+     */
+    //@NotNull(message = "中级分类id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long mediumCategoryId;
+
+    /**
+     * 低级分类id
+     */
+    //@NotNull(message = "低级分类id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long bottomCategoryId;
+
+    /**
+     * 所属平台 (0=平台,1=工业品,2=福利,3=企业购,4=大客户)
+     */
+    //@NotNull(message = "所属平台 (0=平台,1=工业品,2=福利,3=企业购,4=大客户)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long platform;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    //@NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

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

@@ -167,4 +167,9 @@ public class ProductCategoryBo extends BaseEntity {
      */
     private Long reviewerId;
 
+    /**
+     * 客户id
+     * */
+    private Long customerId;
+
 }

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

@@ -0,0 +1,87 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProductCategoryBinding;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 其它分类与商品的绑定视图对象 product_category_binding
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProductCategoryBinding.class)
+public class ProductCategoryBindingVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    @ExcelProperty(value = "商品id")
+    private Long productId;
+
+    /**
+     * 商品编号
+     */
+    @ExcelProperty(value = "商品编号")
+    private String productNo;
+
+    /**
+     * 顶级分类id
+     */
+    @ExcelProperty(value = "顶级分类id")
+    private Long topCategoryId;
+
+    /**
+     * 中级分类id
+     */
+    @ExcelProperty(value = "中级分类id")
+    private Long mediumCategoryId;
+
+    /**
+     * 低级分类id
+     */
+    @ExcelProperty(value = "低级分类id")
+    private Long bottomCategoryId;
+
+    /**
+     * 所属平台 (0=平台,1=工业品,2=福利,3=企业购,4=大客户)
+     */
+    @ExcelProperty(value = "所属平台 (0=平台,1=工业品,2=福利,3=企业购,4=大客户)")
+    private Long platform;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -190,5 +190,10 @@ public class ProductCategoryVo implements Serializable {
      */
     private Long reviewerId;
 
+    /**
+     * 客户id
+     * */
+    private Long customerId;
+
 
 }

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

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProductCategoryBinding;
+import org.dromara.product.domain.vo.ProductCategoryBindingVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 其它分类与商品的绑定Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+public interface ProductCategoryBindingMapper extends BaseMapperPlus<ProductCategoryBinding, ProductCategoryBindingVo> {
+
+}

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

@@ -0,0 +1,81 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProductCategoryBinding;
+import org.dromara.product.domain.bo.ProductBaseBo;
+import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.domain.vo.ProductCategoryBindingVo;
+import org.dromara.product.domain.bo.ProductCategoryBindingBo;
+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-06-04
+ */
+public interface IProductCategoryBindingService extends IService<ProductCategoryBinding>{
+
+    /**
+     * 查询其它分类与商品的绑定
+     *
+     * @param id 主键
+     * @return 其它分类与商品的绑定
+     */
+    ProductCategoryBindingVo queryById(Long id);
+
+    /**
+     * 分页查询其它分类与商品的绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 其它分类与商品的绑定分页列表
+     */
+    TableDataInfo<ProductCategoryBindingVo> queryPageList(ProductCategoryBindingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的其它分类与商品的绑定列表
+     *
+     * @param bo 查询条件
+     * @return 其它分类与商品的绑定列表
+     */
+    List<ProductCategoryBindingVo> queryList(ProductCategoryBindingBo bo);
+
+    /**
+     * 新增其它分类与商品的绑定
+     *
+     * @param bo 其它分类与商品的绑定
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProductCategoryBindingBo bo);
+
+    /**
+     * 修改其它分类与商品的绑定
+     *
+     * @param bo 其它分类与商品的绑定
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProductCategoryBindingBo bo);
+
+    /**
+     * 校验并批量删除其它分类与商品的绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取分类绑定的商品列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 商品列表
+     */
+    TableDataInfo<ProductBaseVo> getCategoryBindingProductPage(ProductBaseBo bo, PageQuery pageQuery);
+}

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

@@ -73,6 +73,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     private final ProductCustomizationMapper customizationMapper;
     //产品分类Mapper
     private final ProductCategoryMapper categoryMapper;
+    //获取分类绑定的商品
+    private final ProductCategoryBindingMapper productCategoryBindingMapper;
     //品牌信息
     private final ProductBrandMapper brandMapper;
     //单位信息
@@ -98,6 +100,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     private final ProductProgramLinkMapper productProgramLinkMapper;
     private final ProductGiftCategoryMapper productGiftCategoryMapper;
     private final ProductSpecialLinkMapper productSpecialLinkMapper;
+    private final ClientSiteMapper clientSiteMapper ;
     private final ClientSiteProductMapper clientSiteProductMapper;
     private final ClientSiteFloorLinkMapper clientSiteFloorLinkMapper;
     private final ProductSelfMapper productSelfMapper;
@@ -411,7 +414,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();
@@ -1510,72 +1513,189 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
      */
     @Override
     public TableDataInfo<PcProductVo> getPcProductPage(PcProductBo bo, PageQuery pageQuery) {
-        QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
-        if(ObjectUtil.isNotEmpty( bo.getIds())){
-            lqw.in("b.id", bo.getIds().split(","));
-        }
-        if (ObjectUtil.isNotEmpty(bo.getBrandIds())){
-            lqw.in("b.brand_id", bo.getBrandIds().split(","));
-        }
-        if (ObjectUtil.isNotEmpty(bo.getCategoryIds())){
-            lqw.in("b.bottom_category_id", bo.getCategoryIds().split(","));
-        }
-        lqw.ge(ObjectUtil.isNotEmpty(pageQuery.getFirstSeenId()) && pageQuery.getWay() == 0,"b.id", pageQuery.getFirstSeenId());
-        lqw.gt(ObjectUtil.isNotEmpty(pageQuery.getLastSeenId()) && pageQuery.getWay() == 1,"b.id", pageQuery.getLastSeenId());
-        lqw.eq(ObjectUtil.isNotEmpty(bo.getIsSelf()), "b.is_self", bo.getIsSelf());
-//        lqw.eq("b.product_status", 1);
-        lqw.and(ObjectUtil.isNotEmpty(bo.getSearchKeyword())
-            , (queryWrapper) -> queryWrapper.and(qw ->
-                qw.like("b.item_name", bo.getSearchKeyword())
-                    .or().like("tc.category_name", bo.getSearchKeyword())
-                    .or().like("mc.category_name", bo.getSearchKeyword())
-                    .or().like("bc.category_name", bo.getSearchKeyword())
-                    .or().like("br.brand_name", bo.getSearchKeyword())
-            )
-        );
-        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.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){
-            //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
-            switch (bo.getPriceRange()) {
-                case "1":
-                    lqw.between("p.market_price", 1, 100);
-                case "2":
-                    lqw.between("p.market_price", 100, 500);
-                case "3":
-                    lqw.between("p.market_price", 500, 1000);
-                case "4":
-                    lqw.ge("p.market_price", 1000);
+        //获取当前登录用户的商品池
+        List<Long> productIds = new ArrayList<>();
+        Map<Long, BigDecimal> agreementPriceMap = new HashMap<>();
+
+        //是否是大客户
+        if(ObjectUtil.isNotEmpty(LoginHelper.getLoginUser().getCustomerId())) {
+            ClientSiteVo clientSiteVo = clientSiteMapper.selectVoOne(Wrappers.lambdaQuery(ClientSite.class)
+                .eq(ClientSite::getClientId, LoginHelper.getLoginUser().getCustomerId())
+                .orderByDesc(ClientSite::getCreateTime)
+                .last("limit 1")
+            );
+            if (ObjectUtil.isNotEmpty(clientSiteVo)) {
+                Long isDiy = clientSiteVo.getIsDiy();
+                if (ObjectUtil.isNotEmpty(isDiy) && isDiy == 1) {
+                    //获取协议商品池商品
+                    List<ProtocolProducts> protocolProducts = protocolProductsMapper.selectList(Wrappers.lambdaQuery(ProtocolProducts.class)
+                        .eq(ProtocolProducts::getCustomerId, LoginHelper.getLoginUser().getCustomerId())
+                        .eq(ProtocolProducts::getAuditStatus, 2)
+                    );
+                    if (CollUtil.isNotEmpty(protocolProducts)) {
+                        agreementPriceMap = protocolProducts.stream().collect(Collectors.toMap(ProtocolProducts::getProductId, ProtocolProducts::getAgreementPrice));
+                        productIds = protocolProducts.stream().map(ProtocolProducts::getProductId).toList();
+                    }
+                }
             }
-        }
-        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":
-                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"b.id");
-                    case "2":
-                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"p.total_inventory");
-                    case "3":
-                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"p.market_price");
+        }else {
+            //获取企业的商品池商品
+            if(Objects.equals(LoginHelper.getLoginUser().getUserSonType(),"3")) {
+                List<ClientSiteProduct> clientSiteProducts = clientSiteProductMapper.selectList();
+                if (CollUtil.isNotEmpty(clientSiteProducts)) {
+                    productIds = clientSiteProducts.stream().map(ClientSiteProduct::getProductId).toList();
                 }
             }
         }
 
+//        //是否是企业购
+//        QueryWrapper<ProductBase> lqw = Wrappers.query(ProductBase.class);
+//        if(Objects.equals(LoginHelper.getLoginUser().getUserSonType(),"3")){
+//            if (ObjectUtil.isNotEmpty(productIds) ){
+//                lqw.in("b.id", productIds);
+//            }else {
+//                lqw.isNull("b.id");
+//            }
+//            if (ObjectUtil.isNotEmpty(bo.getTopCategoryId())){
+//                //获取分类绑定的商品
+//                List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+//                    .eq(ProductCategoryBinding::getTopCategoryId, bo.getTopCategoryId())
+//                );
+//                if (CollUtil.isNotEmpty(productCategoryBindings)) {
+//                    lqw.in("b.id", productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+//                }else {
+//                    lqw.isNull("b.id");
+//                }
+//            }
+//            if (ObjectUtil.isNotEmpty(bo.getMediumCategoryId())){
+//                //获取分类绑定的商品
+//                List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+//                    .eq(ProductCategoryBinding::getMediumCategoryId, bo.getMediumCategoryId())
+//                );
+//                if (CollUtil.isNotEmpty(productCategoryBindings)) {
+//                    lqw.in("b.id", productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+//                }else {
+//                    lqw.isNull("b.id");
+//                }
+//            }
+//            if (ObjectUtil.isNotEmpty(bo.getBottomCategoryId())){
+//                //获取分类绑定的商品
+//                List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+//                    .eq(ProductCategoryBinding::getBottomCategoryId, bo.getBottomCategoryId())
+//                );
+//                if (CollUtil.isNotEmpty(productCategoryBindings)) {
+//                    lqw.in("b.id", productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+//                }else {
+//                    lqw.isNull("b.id");
+//                }
+//            }
+//        }
+//
+//        if(ObjectUtil.isNotEmpty( bo.getIds())){
+//            lqw.in("b.id", bo.getIds().split(","));
+//        }
+//
+//        if (ObjectUtil.isNotEmpty(bo.getBrandIds())){
+//            lqw.in("b.brand_id", bo.getBrandIds().split(","));
+//        }
+//        if (ObjectUtil.isNotEmpty(bo.getCategoryIds())){
+//            lqw.in("b.bottom_category_id", bo.getCategoryIds().split(","));
+//        }
+//        lqw.ge(ObjectUtil.isNotEmpty(pageQuery.getFirstSeenId()) && pageQuery.getWay() == 0,"b.id", pageQuery.getFirstSeenId());
+//        lqw.gt(ObjectUtil.isNotEmpty(pageQuery.getLastSeenId()) && pageQuery.getWay() == 1,"b.id", pageQuery.getLastSeenId());
+//        lqw.eq(ObjectUtil.isNotEmpty(bo.getIsSelf()), "b.is_self", bo.getIsSelf());
+////        lqw.eq("b.product_status", 1);
+//        lqw.and(ObjectUtil.isNotEmpty(bo.getSearchKeyword())
+//            , (queryWrapper) -> queryWrapper.and(qw ->
+//                qw.like("b.item_name", bo.getSearchKeyword())
+//                    .or().like("tc.category_name", bo.getSearchKeyword())
+//                    .or().like("mc.category_name", bo.getSearchKeyword())
+//                    .or().like("bc.category_name", bo.getSearchKeyword())
+//                    .or().like("br.brand_name", bo.getSearchKeyword())
+//            )
+//        );
+//        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.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){
+//            //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
+//            switch (bo.getPriceRange()) {
+//                case "1":
+//                    lqw.between("p.market_price", 1, 100);
+//                case "2":
+//                    lqw.between("p.market_price", 100, 500);
+//                case "3":
+//                    lqw.between("p.market_price", 500, 1000);
+//                case "4":
+//                    lqw.ge("p.market_price", 1000);
+//            }
+//        }
+//        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":
+//                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"b.id");
+//                    case "2":
+//                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"p.total_inventory");
+//                    case "3":
+//                        lqw.orderBy( true, sortOrders[i].equals("Asc"),"p.market_price");
+//                }
+//            }
+//        }
+
         // 使用ES分页查询
         try {
             LambdaEsQueryWrapper<ProductBaseVo> esQueryWrapper = buildEsQueryWrapperForPc(bo);
-
-
+            if(Objects.equals(LoginHelper.getLoginUser().getUserSonType(),"3")){
+                if (ObjectUtil.isNotEmpty(productIds) ){
+                    esQueryWrapper.in(ProductBaseVo::getId, productIds);
+                }else {
+                    esQueryWrapper.eq(ProductBaseVo::getId, 0L);
+                }
+                if (ObjectUtil.isNotEmpty(bo.getTopCategoryId())){
+                    //获取分类绑定的商品
+                    List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+                        .eq(ProductCategoryBinding::getTopCategoryId, bo.getTopCategoryId())
+                    );
+                    if (CollUtil.isNotEmpty(productCategoryBindings)) {
+                        esQueryWrapper.in(ProductBaseVo::getId, productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+                    }else {
+                        esQueryWrapper.eq(ProductBaseVo::getId, 0L);
+                    }
+                }
+                if (ObjectUtil.isNotEmpty(bo.getMediumCategoryId())){
+                    //获取分类绑定的商品
+                    List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+                        .eq(ProductCategoryBinding::getMediumCategoryId, bo.getMediumCategoryId())
+                    );
+                    if (CollUtil.isNotEmpty(productCategoryBindings)) {
+                        esQueryWrapper.in(ProductBaseVo::getId, productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+                    }else {
+                        esQueryWrapper.eq(ProductBaseVo::getId, 0L);
+                    }
+                }
+                if (ObjectUtil.isNotEmpty(bo.getBottomCategoryId())){
+                    //获取分类绑定的商品
+                    List<ProductCategoryBinding> productCategoryBindings = productCategoryBindingMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+                        .eq(ProductCategoryBinding::getBottomCategoryId, bo.getBottomCategoryId())
+                    );
+                    if (CollUtil.isNotEmpty(productCategoryBindings)) {
+                        esQueryWrapper.in(ProductBaseVo::getId, productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+                    }else {
+                        esQueryWrapper.eq(ProductBaseVo::getId, 0L);
+                    }
+                }
+            }
             // 检查ES索引是否存在
             if (!esMapper.existsIndex("productbasevo")) {
                 log.warn("ES索引 [productbasevo] 不存在，降级到数据库查询");
-                return fallbackPcProductQuery(bo, pageQuery, lqw);
+//                return fallbackPcProductQuery(bo, pageQuery, lqw);
+                return TableDataInfo.build();
             }
 
             EsPageInfo<ProductBaseVo> esPageInfo = esMapper.pageQuery(esQueryWrapper, pageQuery.getPageNum(), pageQuery.getPageSize());
@@ -1588,7 +1708,8 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             }
         } catch (Exception e) {
             log.error("ES查询PC端商品列表失败，降级到数据库查询: {}", e.getMessage(), e);
-            return fallbackPcProductQuery(bo, pageQuery, lqw);
+//            return fallbackPcProductQuery(bo, pageQuery, lqw);
+            return TableDataInfo.build();
         }
 
         return TableDataInfo.build();

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

@@ -0,0 +1,214 @@
+package org.dromara.product.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+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;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.easyes.core.biz.EsPageInfo;
+import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
+import org.dromara.product.domain.bo.ProductBaseBo;
+import org.dromara.product.domain.vo.*;
+import org.dromara.product.esmapper.ProductEsMapper;
+import org.dromara.product.mapper.ProductCategoryMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProductCategoryBindingBo;
+import org.dromara.product.domain.ProductCategoryBinding;
+import org.dromara.product.mapper.ProductCategoryBindingMapper;
+import org.dromara.product.service.IProductCategoryBindingService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 其它分类与商品的绑定Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-06-04
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProductCategoryBindingServiceImpl  extends ServiceImpl<ProductCategoryBindingMapper, ProductCategoryBinding> implements IProductCategoryBindingService {
+
+    private final ProductCategoryBindingMapper baseMapper;
+
+    private final ProductCategoryMapper productCategoryMapper;
+
+    private final ProductEsMapper productEsMapper;
+
+    /**
+     * 查询其它分类与商品的绑定
+     *
+     * @param id 主键
+     * @return 其它分类与商品的绑定
+     */
+    @Override
+    public ProductCategoryBindingVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询其它分类与商品的绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 其它分类与商品的绑定分页列表
+     */
+    @Override
+    public TableDataInfo<ProductCategoryBindingVo> queryPageList(ProductCategoryBindingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProductCategoryBinding> lqw = buildQueryWrapper(bo);
+        Page<ProductCategoryBindingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的其它分类与商品的绑定列表
+     *
+     * @param bo 查询条件
+     * @return 其它分类与商品的绑定列表
+     */
+    @Override
+    public List<ProductCategoryBindingVo> queryList(ProductCategoryBindingBo bo) {
+        LambdaQueryWrapper<ProductCategoryBinding> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProductCategoryBinding> buildQueryWrapper(ProductCategoryBindingBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProductCategoryBinding> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProductCategoryBinding::getId);
+        lqw.eq(bo.getProductId() != null, ProductCategoryBinding::getProductId, bo.getProductId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductNo()), ProductCategoryBinding::getProductNo, bo.getProductNo());
+        lqw.eq(bo.getTopCategoryId() != null, ProductCategoryBinding::getTopCategoryId, bo.getTopCategoryId());
+        lqw.eq(bo.getMediumCategoryId() != null, ProductCategoryBinding::getMediumCategoryId, bo.getMediumCategoryId());
+        lqw.eq(bo.getBottomCategoryId() != null, ProductCategoryBinding::getBottomCategoryId, bo.getBottomCategoryId());
+        lqw.eq(bo.getPlatform() != null, ProductCategoryBinding::getPlatform, bo.getPlatform());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProductCategoryBinding::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProductCategoryBinding::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增其它分类与商品的绑定
+     *
+     * @param bo 其它分类与商品的绑定
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProductCategoryBindingBo bo) {
+        //通过第三级获取一二级分类
+        ProductCategoryVo bottomCategory = productCategoryMapper.selectVoById(bo.getBottomCategoryId());
+        if (ObjectUtil.isNotEmpty(bottomCategory)) {
+            bo.setMediumCategoryId(bottomCategory.getParentId());
+            ProductCategoryVo mediumCategory = productCategoryMapper.selectVoById(bottomCategory.getParentId());
+            if(ObjectUtil.isNotEmpty(mediumCategory)) {
+                bo.setTopCategoryId(mediumCategory.getParentId());
+            }
+        }
+        ProductCategoryBinding add = MapstructUtils.convert(bo, ProductCategoryBinding.class);
+        validEntityBeforeSave(add);
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改其它分类与商品的绑定
+     *
+     * @param bo 其它分类与商品的绑定
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProductCategoryBindingBo bo) {
+        //通过第三级获取一二级分类
+        ProductCategoryVo bottomCategory = productCategoryMapper.selectVoById(bo.getBottomCategoryId());
+        if (ObjectUtil.isNotEmpty(bottomCategory)) {
+            bo.setMediumCategoryId(bottomCategory.getParentId());
+            ProductCategoryVo mediumCategory = productCategoryMapper.selectVoById(bottomCategory.getParentId());
+            if(ObjectUtil.isNotEmpty(mediumCategory)) {
+                bo.setTopCategoryId(mediumCategory.getParentId());
+            }
+        }
+        ProductCategoryBinding update = MapstructUtils.convert(bo, ProductCategoryBinding.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProductCategoryBinding entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除其它分类与商品的绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 获取分类绑定的商品列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 商品列表
+     */
+    @Override
+    public TableDataInfo<ProductBaseVo> getCategoryBindingProductPage(ProductBaseBo bo, PageQuery pageQuery) {
+        //先获取分类下的商品id
+        List<ProductCategoryBinding> productCategoryBindings = baseMapper.selectList(Wrappers.lambdaQuery(ProductCategoryBinding.class)
+            .eq(ProductCategoryBinding::getBottomCategoryId, bo.getCategoryIds())
+        );
+        if (ObjectUtil.isEmpty(productCategoryBindings)) {
+            return TableDataInfo.build();
+        }
+        LambdaEsQueryWrapper<ProductBaseVo> wrapper = new LambdaEsQueryWrapper<ProductBaseVo>();
+        if (ObjectUtil.isNotEmpty(bo.getProductNo())) {
+            wrapper.eq(ProductBaseVo::getProductNo, bo.getProductNo());
+        }
+        if (ObjectUtil.isNotEmpty(bo.getItemName())) {
+            wrapper.eq(ProductBaseVo::getItemName, bo.getItemName());
+        }
+        if (ObjectUtil.isNotEmpty(bo.getBrandId())) {
+            wrapper.eq(ProductBaseVo::getBrandId, bo.getBrandId());
+        }
+        if (ObjectUtil.isNotEmpty(bo.getTopCategoryId())) {
+            wrapper.eq(ProductBaseVo::getTopCategoryId, bo.getTopCategoryId());
+        }
+        if (ObjectUtil.isNotEmpty(bo.getMediumCategoryId())) {
+            wrapper.eq(ProductBaseVo::getMediumCategoryId, bo.getMediumCategoryId());
+        }
+        if (ObjectUtil.isNotEmpty(bo.getBottomCategoryId())) {
+            wrapper.eq(ProductBaseVo::getBottomCategoryId, bo.getBottomCategoryId());
+        }
+
+        wrapper.in(ProductBaseVo::getId, productCategoryBindings.stream().map(ProductCategoryBinding::getProductId).toList());
+        EsPageInfo<ProductBaseVo> esPageInfo = productEsMapper.pageQuery(wrapper, pageQuery.getPageNum(), pageQuery.getPageSize());
+        TableDataInfo<ProductBaseVo> build = TableDataInfo.build(esPageInfo.getList());
+        build.setTotal(esPageInfo.getTotal());
+        return build;
+
+    }
+}

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

@@ -111,6 +111,7 @@ public class ProductCategoryServiceImpl  extends ServiceImpl<ProductCategoryMapp
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ProductCategory> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(ProductCategory::getSort);
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getCustomerId()), ProductCategory::getCustomerId, bo.getCustomerId());
         lqw.eq(StringUtils.isNotBlank(bo.getCategoryNo()), ProductCategory::getCategoryNo, bo.getCategoryNo());
         lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), ProductCategory::getCategoryName, bo.getCategoryName());
         lqw.eq(bo.getParentId() != null, ProductCategory::getParentId, bo.getParentId());

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

@@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER JOIN product_base product ON product.top_category_id = category.id
         INNER JOIN product_brand brand ON brand.id = product.brand_id
         <where>
-            brand.is_show = 1
             <if test="categoryId != null">
                 AND category.id = #{categoryId}
             </if>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.product.mapper.ProductCategoryBindingMapper">
+
+</mapper>