Merge branch 'hotfix/unionData' into 'release/5.4.1'

union data 容错处理



See merge request !320

@@ -223,11 +223,19 @@ exports.orderSub = (req, res, next) => {
                 unionKey = testQyhUnion.client_id ? encryData : '';
                 unionKey = testQyhUnion.client_id ? encryData : '';
             }
             }
         } else {
         } else {
-            unionKey = '{"client_id":' + req.cookies.mkt_code + (req.cookies.union_data ? ',"union_data":' + req.cookies.union_data : '') + '}';
+            unionKey = '{"client_id":' + req.cookies.mkt_code +
+                (req.cookies.union_data ? ',"union_data":' + req.cookies.union_data : '') + '}';
         }
         }
 
 
         /* 检查联盟参数是否有效 */
         /* 检查联盟参数是否有效 */
-        unionInfo = unionKey ? JSON.parse(unionKey) : {};
+        try {
+            unionInfo = JSON.parse(unionKey);
+        } catch (e) {
+            unionInfo = {};
+            logger.error(`orderEnsure: mkt_code:${req.cookies.mkt_code}, union_data:${req.cookies.union_data}`);
+        }
+
+        unionInfo = unionKey ? unionInfo : {};
 
 
         /* 模拟APP的User-Agent */
         /* 模拟APP的User-Agent */
         userAgent = unionInfo.client_id ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' +
         userAgent = unionInfo.client_id ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' +