Merge branch 'pcwap推广链接共通参数种cookies'

@@ -105,17 +105,18 @@ public class BigDataOrderInfoTask {
             //获取trackingCode
             orderInfo.setTrackingCode(userOrders.getTrackingCode());
             orderInfo.setMbrName(userOrders.getMbrName());
-            //组装分类
-            if (!orderInfoMap.containsKey(orderInfo.getClientId())) {
-                orderInfoMap.put(orderInfo.getClientId(), Lists.newArrayList(orderInfo));
-                continue;
-            }
 
             // 获取 union_data返回
             UserOrdersRelation userOrdersRelation = userOrdersRelationMap.get(userOrders.getId());
             if (userOrdersRelation != null){
                 orderInfo.setUnionData(userOrdersRelation.getUnionData());
             }
+            //组装分类
+            if (!orderInfoMap.containsKey(orderInfo.getClientId())) {
+                orderInfoMap.put(orderInfo.getClientId(), Lists.newArrayList(orderInfo));
+                continue;
+            }
+
             orderInfoMap.get(orderInfo.getClientId()).add(orderInfo);
         }