Merge branch 'feature/cart' into 'release/5.4.1'

wechat-api-modified



See merge request !318

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-01-03 17:42:41
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-02-20 17:46:16
+ * @Last Modified time: 2017-02-27 16:34:09
  */
 
 'use strict';
@@ -173,7 +173,7 @@ const Wechat = {
                 ip: ip
             });
 
-            if (unifiedOrderResult) {
+            if (unifiedOrderResult && unifiedOrderResult.appid && unifiedOrderResult.prepay_id) {
                 let nonceStr = common.nonceStr();
 
                 let resParams = {