Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/admin/model/order/StoreOrder.php

@@ -113,7 +113,7 @@ class StoreOrder extends BaseModel
                 $cart_info = json_decode($v['cart_info'], true);
                 if (!isset($cart_info['productInfo'])) $cart_info['productInfo'] = [];
                 $_info[$k]['cart_info'] = $cart_info;
-                if ($cart_info['is_suit']) $is_suit = true;
+                if (isset($cart_info['is_suit']) && $cart_info['is_suit']) $is_suit = true;
                 unset($cart_info);
             }
             $item['_info'] = $_info;