推送记录判断

application/api_broker/service/OrderLogService.php

@@ -69,7 +69,7 @@ class OrderLogService
                                         $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id, $is_open)
     {
         $bill_arr = $params = [];
-        $father_id = 0;
+        $father_id = $pay_type = 0;
         foreach ($collecting_bill as $collecting) {
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 if ($father_id == 0) {
@@ -82,6 +82,7 @@ class OrderLogService
                 }
 
                 $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
+                $pay_type = $collecting['pay_type'];
             }
         }
         if ($father_id > 0) {
@@ -90,7 +91,7 @@ class OrderLogService
             $oImgModel->addImgAll($father_id, 2, $transfer_img);
 
             $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $collecting["pay_type"]); //推送
+            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $pay_type); //推送
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {
@@ -159,6 +160,7 @@ class OrderLogService
                         $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id));
                 }
                 $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
+                $pay_type = $collecting['pay_type'];
             }
         }
         if ($father_id > 0) {
@@ -174,7 +176,7 @@ class OrderLogService
             }
 
             $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $collecting["pay_type"]); //推送
+            $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id, $pay_type); //推送
         }
         //todo if bill_arr not null, save database table
         if (!empty($bill_arr)) {

application/api_broker/service/PushMessageService.php

@@ -78,7 +78,7 @@ class PushMessageService
      * @param $report_id
      * @param $type
      * @param $operation_id
-     * @param $type_source
+     * @param $type_source @付款类型
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException