Commit b78ce3a3 authored by hujun's avatar hujun

错误修改

parent 92c170a9
...@@ -73,7 +73,7 @@ class OrderLog extends Basic ...@@ -73,7 +73,7 @@ class OrderLog extends Basic
$is_ok = $this->o_march_in_model->addMarchIn($params); $is_ok = $this->o_march_in_model->addMarchIn($params);
if ($is_ok > 0) { if ($is_ok > 0) {
$pushMarchIn = new PushMessageService(); $pushMarchIn = new PushMessageService();
$pushMarchIn->pushMarchInMessage($params["report_id"]); //推送 $pushMarchIn->pushMarchInMessage($params["report_id"], 1, $params["report_id"]); //推送
return $this->response("200", "request success", []); return $this->response("200", "request success", []);
} else { } else {
return $this->response("101", "request faild"); return $this->response("101", "request faild");
......
...@@ -128,8 +128,8 @@ class OrderLogService ...@@ -128,8 +128,8 @@ class OrderLogService
} }
} }
if ($father_id > 0) { if ($father_id > 0) {
$pushMarchIn = new PushMessageService($params["report_id"], 2); $pushMarchIn = new PushMessageService();
$pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送 $pushMarchIn->pushMarchInMessage($params["report_id"], 2, $agent_id); //推送
} }
//todo if bill_arr not null, save database table //todo if bill_arr not null, save database table
if (!empty($bill_arr)) { if (!empty($bill_arr)) {
......
...@@ -60,13 +60,14 @@ class PushMessageService ...@@ -60,13 +60,14 @@ class PushMessageService
/** /**
* 1.进场推送 2.收款推送 * 1.进场推送 2.收款推送
* *
* @param int $report_id * @param $report_id
* @param int $type * @param $type
* @param $operation_id
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function pushMarchInMessage($report_id = 0, $type = 1, $operation_id) public function pushMarchInMessage($report_id, $type, $operation_id)
{ {
$report = new OReportModel(); $report = new OReportModel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment