Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

console/controllers/MqController.php

@@ -52,6 +52,7 @@ class MqController extends Controller
                         WxMessageClass::ghsHasNewOrderInform($shop, $order);
 
                         // 向供货商App发通知
+                        // $cg = PurchaseClass::getByCondition(['orderSn' => $order->orderSn], true, false, 'id, shopId');
 //                        $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
 //                        $push = new push('ghs', push::MSG_TYPE_ORDER);
 //                        $push->ghsOrderMessage($shop, $cgShop, $order);