feat(category): 添加分类主题色配置功能

- 在EpCategoryMainVo中新增categoryThemeColor字段
- 在EpHeaderCategoryVo中新增headerThemeColor字段
- 注入IEpSearchConfigService服务依赖
- 在查询分类列表时获取当前搜索配置并设置主题色
- 移除OrderAssignmentServiceImpl中的平
- 修正订单服务中平台分配的相关注释

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/EpCategoryMainVo.java

@@ -93,5 +93,7 @@ public class EpCategoryMainVo implements Serializable {
      */
     List<EpCategoryItemVo> notes;
 
+    private String categoryThemeColor;
+
 
 }

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/EpHeaderCategoryVo.java

@@ -35,19 +35,19 @@ public class EpHeaderCategoryVo implements Serializable {
     private Long id;
 
     /**
-     * 分类名称 
+     * 分类名称
      */
     @ExcelProperty(value = "分类名称 ")
     private String title;
 
     /**
-     * 分类图标URL 
+     * 分类图标URL
      */
     @ExcelProperty(value = "分类图标URL ")
     private String icon;
 
     /**
-     * 跳转地址 
+     * 跳转地址
      */
     @ExcelProperty(value = "跳转地址 ")
     private String link;
@@ -70,5 +70,8 @@ public class EpHeaderCategoryVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /*头部主题色*/
+    private String headerThemeColor;
+
 
 }

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/EpCategoryMainServiceImpl.java

@@ -19,9 +19,11 @@ import org.dromara.mall.domain.bo.EpCategoryMainBo;
 import org.dromara.mall.domain.vo.EpCategoryItemVo;
 import org.dromara.mall.domain.vo.EpCategoryMainVo;
 import org.dromara.mall.domain.vo.EpCategoryResponseVo;
+import org.dromara.mall.domain.vo.EpSearchConfigVo;
 import org.dromara.mall.mapper.EpCategoryItemMapper;
 import org.dromara.mall.mapper.EpCategoryMainMapper;
 import org.dromara.mall.service.IEpCategoryMainService;
+import org.dromara.mall.service.IEpSearchConfigService;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -43,6 +45,8 @@ public class EpCategoryMainServiceImpl extends ServiceImpl<EpCategoryMainMapper,
 
     private final EpCategoryItemMapper categoryItemMapper;
 
+    private final IEpSearchConfigService searchConfigService;
+
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     /**
@@ -125,10 +129,13 @@ public class EpCategoryMainServiceImpl extends ServiceImpl<EpCategoryMainMapper,
         LambdaQueryWrapper<EpCategoryMain> lqw = buildQueryWrapper(bo);
         Page<EpCategoryMainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         List<EpCategoryMainVo> records = result.getRecords();
-
+        EpSearchConfigVo currentSearchConfig = searchConfigService.getCurrentSearchConfig();
         // 为每个分类填充对应的标签项
         for (EpCategoryMainVo record : records) {
             fillCategoryItems(record);
+            if (null!=currentSearchConfig){
+                record.setCategoryThemeColor(currentSearchConfig.getCategoryThemeColor());
+            }
         }
 
         return TableDataInfo.build(result);

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/EpHeaderCategoryServiceImpl.java

@@ -13,8 +13,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.mall.domain.EpHeaderCategory;
 import org.dromara.mall.domain.bo.EpHeaderCategoryBo;
 import org.dromara.mall.domain.vo.EpHeaderCategoryVo;
+import org.dromara.mall.domain.vo.EpSearchConfigVo;
 import org.dromara.mall.mapper.EpHeaderCategoryMapper;
 import org.dromara.mall.service.IEpHeaderCategoryService;
+import org.dromara.mall.service.IEpSearchConfigService;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -34,6 +36,8 @@ public class EpHeaderCategoryServiceImpl extends ServiceImpl<EpHeaderCategoryMap
 
     private final EpHeaderCategoryMapper baseMapper;
 
+    private final IEpSearchConfigService searchConfigService;
+
     /**
      * 查询头部分类管理
      *
@@ -56,6 +60,13 @@ public class EpHeaderCategoryServiceImpl extends ServiceImpl<EpHeaderCategoryMap
     public TableDataInfo<EpHeaderCategoryVo> queryPageList(EpHeaderCategoryBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<EpHeaderCategory> lqw = buildQueryWrapper(bo);
         Page<EpHeaderCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        EpSearchConfigVo currentSearchConfig = searchConfigService.getCurrentSearchConfig();
+        List<EpHeaderCategoryVo> records = result.getRecords();
+        for (EpHeaderCategoryVo record : records) {
+            if (null!=currentSearchConfig){
+               record.setHeaderThemeColor(currentSearchConfig.getHeaderThemeColor());
+            }
+        }
         return TableDataInfo.build(result);
     }
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderAssignmentServiceImpl.java

@@ -258,7 +258,6 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
     @Transactional(rollbackFor = Exception.class)
     public Boolean splitAssign(OrderSplitAssignBo bo) {
         Long parentId = bo.getOrderId();
-        String platform = PlatformContext.getPlatform(); //当前平台标识
         List<OrderProductAssignRule> rules = bo.getItemRules();
 
         if (CollUtil.isEmpty(rules)) {
@@ -539,7 +538,7 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
             // 分配给 mkt 或 bp 都生成2级订单
             childLevel = parentLevel + 1; // 通常是 1 -> 2
         } else {
-            // 自营订单 (orderType=0) - Market平台分配
+            // 自营订单 (orderType=0) - scm平台分配
             // 分配给 zy 或 srm 都生成3级订单（如果是从1级直接分配）或下一级
             childLevel = parentLevel + 1; // 通常是 2 -> 3
         }
@@ -640,7 +639,7 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
 
             }
         } else {
-            // 自营订单 (Market平台分配)
+            // 自营订单 (scm平台分配)
             if ("zy".equals(assigneeType) || "srm".equals(assigneeType)) {
                 // 2级订单：已分配状态，不可再分配
                 child.setAssignmentStatus(OrderAssignStatus.ASSIGNED.getCode());

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -760,11 +760,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             throw new ServiceException("订单不存在");
         }
         // 判断是否为 zhongche 平台
-        if(Objects.equals(existingOrder.getDataSource(),"zhongche")){
+        if (Objects.equals(existingOrder.getDataSource(), "zhongche")) {
             this.accept(orderId);
         }
         // 判断是否为 tongji 平台
-        if(Objects.equals(existingOrder.getDataSource(),"tongji")){
+        if (Objects.equals(existingOrder.getDataSource(), "tongji")) {
             this.accept(orderId);
         }
 //        String platformCode = PlatformContext.getPlatform();
@@ -1222,7 +1222,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (goodsUpdateVo.getResult() != 1) {
             throw new ZhongcheException("中车订单扩展信息不存在");
         }
-        log.info("接单成功{}",orderNo);
+        log.info("接单成功{}", orderNo);
         //更新扩展表
         orderMainCrrcExtService.update(
             Wrappers.lambdaUpdate(OrderMainCrrcExt.class)
@@ -1242,7 +1242,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             throw new ZhongcheException("订单不存在");
         }
         List<String> dataSources = List.of("zhongche", "tongji");
-        if(!dataSources.contains(orderMain.getDataSource())){
+        if (!dataSources.contains(orderMain.getDataSource())) {
             return false;
         }
         String orderNo = orderMain.getOrderNo();