Merge branch 'order'

app/Constants/LogLabel.php

@@ -28,4 +28,9 @@ class LogLabel extends AbstractConstants
      * @Message("Pay Notice Log Label")
      */
     const PAY_NOTIFY_WXMINI = 'notify_wxmini';
+
+    /**
+     * @Message("Order Log Label")
+     */
+    const ORDER_LOG = 'order_log';
 }

app/Service/DeviceServiceImp.php

@@ -112,8 +112,7 @@ class DeviceServiceImp implements DeviceServiceInterface
                 ->where(['store_id' => $order['store_id'], 'is_bind' => SpeakerDevic::IS_BIND_YES])
                 ->get()
                 ->toArray();
-
-            $msg = "{\"msg\":\"到账".$order['money']."元\"}";
+            $msg = $order['type']==1 ? "{\"msg\":\"您有新的外卖订单\"}" : "{\"msg\":\"到账".$order['money']."元\"}";
             foreach ($device_names as $key => $dev_name) {
                 $this->IOTService->pub($dev_name['device_name'], $msg);
             }

app/Service/MqttSpeakerService.php

@@ -30,7 +30,7 @@ class MqttSpeakerService implements MqttServiceInterface
 
         // 循环发送
         foreach ($orders as $k => &$order) {
-            $order['template'] = "懒族支付到账".floatval($order['money'])."元";
+            $order['template'] = $order['type']==1 ? "您有新的外卖订单" : "到账".floatval($order['money'])."元";
             // 获取终端ID
             $order['to_client_id'] = Store::query()->where(['id' => $order['store_id']])->value('loudspeaker_imei');
             // 发布订阅消息

app/Service/OrderService.php

@@ -2,6 +2,8 @@
 
 namespace App\Service;
 
+use App\Commons\Log;
+use App\Constants\LogLabel;
 use App\Model\Coupon;
 use App\Model\CouponUserRec;
 use App\Model\CouponUserUse;
@@ -19,6 +21,11 @@ use Hyperf\Di\Annotation\Inject;
 
 class OrderService implements OrderServiceInterface
 {
+    /**
+     * @Inject
+     * @var Log
+     */
+    protected $log;
 
     /**
      * @Inject
@@ -333,6 +340,11 @@ class OrderService implements OrderServiceInterface
 
         } catch (Exception $e) {
 
+            $this->log->event(
+                LogLabel::ORDER_LOG,
+                $e->getMessage()
+            );
+
             Db::rollBack();
             return $e->getMessage();
 
@@ -444,6 +456,10 @@ class OrderService implements OrderServiceInterface
             Db::commit();
             return $orderMainId;
         } catch (Exception $e) {
+            $this->log->event(
+                LogLabel::ORDER_LOG,
+                $e->getMessage()
+            );
             Db::rollBack();
             return '购买失败';
         }