Commit 676beeb6 authored by hujun's avatar hujun

1

parent 0a94216a
...@@ -90,7 +90,7 @@ class StoreFee extends Basic ...@@ -90,7 +90,7 @@ class StoreFee extends Basic
return $this->response("101", "办公室水电费每月只能提交一次"); return $this->response("101", "办公室水电费每月只能提交一次");
} }
$is_ok = $this->service_->addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name, $is_ok = $this->service_->addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time, $img_arr, 0, $office_id); $bank, $card_no, $count_time, $img_arr, 0, $office_id, $this->agentId);
if ($is_ok > 0) { if ($is_ok > 0) {
$push = new PushMessageService(); $push = new PushMessageService();
$push->recordApplyForFeDistrict($agent_id, $this->agentId); $push->recordApplyForFeDistrict($agent_id, $this->agentId);
......
...@@ -45,15 +45,16 @@ class StoreFeeService ...@@ -45,15 +45,16 @@ class StoreFeeService
* @param $img_arr * @param $img_arr
* @param int $id * @param int $id
* @param int $office_id * @param int $office_id
* @param int $payee_agent_id
* @return int|string * @return int|string
* @throws \think\Exception * @throws \think\Exception
* @throws \think\exception\PDOException * @throws \think\exception\PDOException
*/ */
public function addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name, public function addApplyFor($type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time, $img_arr, $id = 0, $office_id = 0) $bank, $card_no, $count_time, $img_arr, $id = 0, $office_id = 0, $payee_agent_id)
{ {
$arr = $this->applyForFeeBin($id, $type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name, $arr = $this->applyForFeeBin($id, $type, $fee_item, $total_fee, $agent_id, $store_id, $purpose, $site_id, $card_name,
$bank, $card_no, $count_time, $office_id, 0); $bank, $card_no, $count_time, $office_id, $payee_agent_id);
if ($id) { if ($id) {
$this->applyForFeeModel->updateData($arr, ['id' => $id]); $this->applyForFeeModel->updateData($arr, ['id' => $id]);
$feeId = $id; $feeId = $id;
......
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