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

biz-hd/order/classes/OrderClass.php

@@ -9,6 +9,7 @@ use biz\shop\classes\ShopCapitalClass;
 use biz\shop\classes\ShopClass;
 use biz\shop\models\Shop;
 use biz\stat\classes\StatOrderCountClass;
+use biz\wx\classes\WxMessageClass;
 use bizGhs\stat\classes\StatYjClass;
 use bizGhs\ws\services\WsService;
 use bizHd\stat\classes\StatIncomeClass;
@@ -272,7 +273,6 @@ class OrderClass extends BaseClass
                 OrderSendClass::withoutSend($order);
             }
         } else {
-
             //客户下单增加商家可提现余额
             if (isset($order->customId) && !empty($order->customId)) {
                 $amount = $order->actPrice;
@@ -287,15 +287,17 @@ class OrderClass extends BaseClass
                 }
             }
         };
-
-        //下单通知，来自mall linqh 2021.5.19
+        //来自商城的订单通知 linqh 2021.5.19
         if ($order->fromType == dict::getDict("fromType", "mall")) {
             $shopIdAdminIds = \bizGhs\shop\classes\ShopAdminClass::getRemindAdminIdsByShopId($shopId);
+            //语音通知
             if ($shopIdAdminIds) {
                 foreach ($shopIdAdminIds as $v) {
                     WsService::newOrderNotice($v);
                 }
             }
+            //新订单微信通知
+            WxMessageClass::newOrderInform($shop, $order);
         }
     }
 

biz/wx/classes/WxMessageClass.php

@@ -117,6 +117,7 @@ class WxMessageClass extends BaseClass
             return false;
         }
         $orderId = $order->id;
+        $actPrice = $order->actPrice;
         $adminList = ShopAdminClass::getRemainAdmin($shopId);
         foreach ($adminList as $admin) {
             if (isset($admin['subscribe']) == false || $admin['subscribe'] == 0) {
@@ -130,7 +131,7 @@ class WxMessageClass extends BaseClass
                 "data" => [
                     "first" => ["value" => "您有新的订单，请注意查收", "color" => "#173177"],
                     "keyword1" => ["value" => $order->orderSn, "color" => "#173177"],
-                    "keyword2" => ["value" => $order->actPrice, "color" => "#173177"],
+                    "keyword2" => ["value" => $actPrice, "color" => "#173177"],
                     "keyword3" => ["value" => date("Y-m-d H:i"), "color" => "#173177"],
                     "remark" => ["value" => "点击查看详情", "color" => "#173177"]
                 ]