Merge branch 'release/3.8.2'

ccs_connect_tiktok/controllers/order_controller.py

@@ -721,16 +721,16 @@ class OrderController(http.Controller):
         # 3. 预加载托盘数据（如果需要）
         pallet_data = {}
         if is_pallet:
-            # 先匹配所有服务商，获取ID列表
+            # 使用已构建的provider_index匹配服务商，获取ID列表
             provider_ids = set()
             for pkg in big_packages:
                 if not pkg.next_provider_name:
                     continue
-                for provider in all_providers:
-                    if provider.match_provider(pkg.next_provider_name, all_providers):
-                        provider_ids.add(provider.id)
-                        break
-            
+                provider_key = pkg.next_provider_name.lower().strip()
+                provider = provider_index.get(provider_key)
+                if provider:
+                    provider_ids.add(provider.id)
+
             # 批量查询托盘数据
             if provider_ids:
                 pallet_domain = [('express_company_id', 'in', list(provider_ids))]
@@ -738,7 +738,7 @@ class OrderController(http.Controller):
                     pallet_domain.append(('usage_state', '=', 'unused'))
                 else:
                     pallet_domain.append(('usage_state', '=', 'used'))
-                
+
                 pallets = request.env['cc.pallet'].sudo().search(pallet_domain)
                 for pallet in pallets:
                     if pallet.express_company_id.id not in pallet_data:
@@ -750,13 +750,13 @@ class OrderController(http.Controller):
         for pkg in big_packages:
             if not pkg.next_provider_name:
                 continue
-                
+            next_provider_name=pkg.next_provider_name.lower().strip()
             # 使用缓存的匹配结果
-            if pkg.next_provider_name not in provider_map:
-                provider = provider_index.get(pkg.next_provider_name.lower().strip())
-                provider_map[pkg.next_provider_name] = provider
+            if next_provider_name not in provider_map:
+                provider = provider_index.get(next_provider_name)
+                provider_map[next_provider_name] = provider
             
-            provider = provider_map[pkg.next_provider_name]
+            provider = provider_map[next_provider_name]
             if not provider:
                 continue