Merge branch 'hotfix/unionData' into release/5.4.1

@@ -1074,13 +1074,10 @@ class CartModel
                         $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
                     }
                 } else {
-                    $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . '}';
+                    $unionKey = '{"client_id":' . $_COOKIE['mkt_code'] . $_COOKIE['union_data'] ? ', union_data: '.$_COOKIE['union_data']: '' . '}';
                 }
                 /* 检查联盟参数是否有效 */
                 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
-                if (empty($unionKey) && !empty($_COOKIE['union_data'])){
-                    $unionKey = $_COOKIE['union_data'];
-                }
                 /* 模拟APP的User-Agent */
                 $userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;
             }