核销参数修改

application/index/controller/Finance.php

@@ -1436,7 +1436,7 @@ class Finance extends Basic
             return $this->response(101, '请求参数错误');
         }
 
-        $bargain_data = $this->m_bargain->getCheckBargain('a.id,a.agent_id,a.role,a.create_time,d.store_id,d.district_id,a.report_id', $this->params['bargain_id']);
+        $bargain_data = $this->m_bargain->getCheckBargain('a.id,a.agent_id,a.role,a.create_time,d.store_id,d.district_id,a.report_id,a.order_id', $this->params['bargain_id']);
 
         //排除成交报告其它状态
         if (empty($bargain_data['id'])) {
@@ -1483,7 +1483,7 @@ class Finance extends Basic
                         $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
                         if ($user_id) {
                             $service = new ConvertCouponService();
-                             $service->convertCoupon($user_id, $this->params['report_id'], $this->params['bargain_id'], $this->params['order_id']);  //核销红包
+                             $service->convertCoupon($user_id, $bargain_data['report_id'], $this->params['bargain_id'], $bargain_data['order_id']);  //核销红包
                         }
                     }
                 }