推送bug

application/api_broker/controller/OrderLog.php

@@ -74,6 +74,9 @@ class OrderLog extends Basic
     /**
      * 收款
      * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function collectingBill()
     {

application/api_broker/service/OrderLogService.php

@@ -37,7 +37,7 @@ class OrderLogService
     }
 
     /**
-     *批量插入收款记录
+     * 批量插入收款记录
      * @param $agent_id
      * @param $agent_name
      * @param $report_id
@@ -48,12 +48,15 @@ class OrderLogService
      * @param $industry_type
      * @param $remark
      * @param $transfer_img
-     * @return int
+     * @return int|string
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
                                       $industry_type, $remark, $transfer_img)
     {
-        $bill_arr  = [];
+        $bill_arr  = $params = [];
         $father_id = 0;
         foreach ($collecting_bill as $collecting) {
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
@@ -69,9 +72,10 @@ class OrderLogService
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {
+            $id = $this->payLogModel->addPayLog($bill_arr);
             $pushMarchIn = new PushMessageService($params["report_id"], 2);
             $pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送
-            return $this->payLogModel->addPayLog($bill_arr);
+            return $id;
         }
         return $father_id;
     }