Merge branch 'master' into release/5.2

@@ -824,7 +824,9 @@ $('.to-play input.submit').click(function() {
             $('.product-num').each(function() {
                 productNum += parseInt($(this).html());
             });
-            window.addPoint('YB_SC_TOPAY_CLICK', {ORDER_CODE: d.data.order_code, PRD_NUM: productNum, ORDER_AMOUNT: d.data.order_amount});
+
+            window.addPoint('YB_SC_TOPAY_CLICK', {ORDER_CODE: d.data.order_code, PRD_NUM: productNum, ORDER_AMOUNT: d.data.order_amount, UNIONCOOKIE: d.data.unionKey});
+
             window.location.href = d.data.payUrl;
         } else {
             new dialog.Alert(d.message).show();

 {
   "name": "web-yohobuy",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",

@@ -1063,8 +1063,15 @@ class CartModel
             $userAgent = null;
             $unionKey = '';
             if (!empty($_COOKIE['_QYH_UNION'])) {
-                /* 解密客户端联盟信息 */
-                $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
+                // 新平台统一来源
+                $unionKey = trim(Encryption::decrypt(urldecode($_COOKIE['_QYH_UNION'])));
+                $extraIndex  = strrpos($unionKey, '}') + 1;
+                $unionKey = $encryObject = substr($unionKey, 0, $extraIndex);
+                $unionClient = json_decode($encryObject, true);
+                if (!isset($unionClient['client_id']) || empty($unionClient['client_id'])) {
+                    /* 解密客户端联盟信息(老逻辑) */
+                    $unionKey = AuthCode::decode($_COOKIE['_QYH_UNION'], 'q_union_yohobuy');
+                }
                 /* 检查联盟参数是否有效 */
                 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
                 /* 模拟APP的User-Agent */
@@ -1073,6 +1080,7 @@ class CartModel
 
             $orderSubRes = CartData::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceType, $invoiceTitle, $invoiceContent, $receiverMobile, $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $unionKey, $userAgent, $redEnvelopes);
             if ($orderSubRes && isset($orderSubRes['code'])) {
+                $orderSubRes['data']['unionKey'] = $unionKey;
                 $result = $orderSubRes;
             }
         } while (false);

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.3"
+application.version = "5.1.4"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.3"
+application.version = "5.1.4"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.3"
+application.version = "5.1.4"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.3"
+application.version = "5.1.4"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
 //define('API_OLD', 'http://test2.open.yohobuy.com/');
 
 #dev环境
- define('API_URL', 'http://api-test3.yohops.com:9999');
- define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
+ define('API_URL', 'http://api-test2.yohops.com:9999');
+ define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
  define('YOHOBUY_URL', 'http://www.yohobuy.com/');
  define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/');
  define('API_OLD', 'http://devservice.yoho.cn:58077/');

@@ -14,8 +14,8 @@ define('EXHIBITION_TICKET', 51335912);//展览票skn
 
 define('USE_INTER_FACE_SHUNT', false);//分流开关
 
-define('API_URL', 'http://api-test3.yohops.com:9999/');
-define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
+define('API_URL', 'http://api-test2.yohops.com:9999/');
+define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/');
 define('API_OLD', 'http://test2.open.yohobuy.com/');