Skip to content

T
tl_estate
Commit 1f3ba80f authored by hujun's avatar hujun
Browse files
Options

bank_card

parent 39fca8a1
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 11 deletions
application/api_broker/controller/DailyPaper.php
View file @ 1f3ba80f
...@@ -100,9 +100,10 @@ class DailyPaper extends Basic ...@@ -100,9 +100,10 @@ class DailyPaper extends Basic
$cash = $params["cash"]; $cash = $params["cash"];
$pos = $params["pos"]; $pos = $params["pos"];
$other_bank = $params["other_bank"]; $other_bank = $params["other_bank"];
$bank_card = $params["bank_card"];
$site_id = $this->siteId; $site_id = $this->siteId;
$result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id); $family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
...@@ -156,11 +157,14 @@ class DailyPaper extends Basic ...@@ -156,11 +157,14 @@ class DailyPaper extends Basic
$other_bank = $params["other_bank"]; $other_bank = $params["other_bank"];
$remark = $params["remark"]; $remark = $params["remark"];
$operation_status = $params["operation_status"]; $operation_status = $params["operation_status"];
$tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"];
$bank_card = $params["bank_card"];
if($operation_status != 0 && $operation_status != 1){ if($operation_status != 0 && $operation_status != 1){
return $this->response("101", "审核状态错误"); return $this->response("101", "审核状态错误");
} }
$result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status); $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
......
application/api_broker/service/DailyPaperService.php
View file @ 1f3ba80f
...@@ -426,7 +426,7 @@ class DailyPaperService ...@@ -426,7 +426,7 @@ class DailyPaperService
private function getCheckList($daily_id,$agent_id = 0) private function getCheckList($daily_id,$agent_id = 0)
{ {
$field = "id,daily_id,operation_id,operation_name,remark,alipay,tenpay,realty_pay,family_pay,private_bank, $field = "id,daily_id,operation_id,operation_name,remark,alipay,tenpay,realty_pay,family_pay,private_bank,
cash,pos,other_bank,create_time,update_time,tenpay_2,alipay_2"; cash,pos,other_bank,create_time,update_time,tenpay_2,alipay_2,bank_card";
$params["daily_id"] = $daily_id; $params["daily_id"] = $daily_id;
$params["is_del"] = 0; $params["is_del"] = 0;
if($agent_id > 0){ if($agent_id > 0){
...@@ -451,13 +451,14 @@ class DailyPaperService ...@@ -451,13 +451,14 @@ class DailyPaperService
* @param $tenpay_2 * @param $tenpay_2
* @param $alipay_2 * @param $alipay_2
* @param $site_id * @param $site_id
* @param $bank_card
* @return array * @return array
* @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 addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, public function addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id) $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card)
{ {
$agent_info_arr["agent_id"] = $agent_id; $agent_info_arr["agent_id"] = $agent_id;
$agent_info_field = "id,name,store_id,district_id,level"; $agent_info_field = "id,name,store_id,district_id,level";
...@@ -472,7 +473,7 @@ class DailyPaperService ...@@ -472,7 +473,7 @@ class DailyPaperService
return ["code" => 101, "msg" => "请勿重复提交日报"]; return ["code" => 101, "msg" => "请勿重复提交日报"];
} }
$params = $this->dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $params = $this->dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $agent_info[0]["store_id"], $agent_info[0]["district_id"], $tenpay_2, $alipay_2, $site_id); $family_pay, $private_bank, $cash, $pos, $other_bank, $agent_info[0]["store_id"], $agent_info[0]["district_id"], $tenpay_2, $alipay_2, $site_id, $bank_card);
$is_ok = $this->oDailyModel->addDaily($params); $is_ok = $this->oDailyModel->addDaily($params);
if ($is_ok > 0) { if ($is_ok > 0) {
return ["code" => 200, "data" => null]; return ["code" => 200, "data" => null];
...@@ -482,7 +483,7 @@ class DailyPaperService ...@@ -482,7 +483,7 @@ class DailyPaperService
} }
public function dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, public function dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $store_id, $district_id, $tenpay_2, $alipay_2, $site_id) $family_pay, $private_bank, $cash, $pos, $other_bank, $store_id, $district_id, $tenpay_2, $alipay_2, $site_id, $bank_card)
{ {
$arr["agent_id"] = $agent_id; $arr["agent_id"] = $agent_id;
$arr["agent_name"] = $agent_name; $arr["agent_name"] = $agent_name;
...@@ -497,6 +498,7 @@ class DailyPaperService ...@@ -497,6 +498,7 @@ class DailyPaperService
$arr["cash"] = $cash; $arr["cash"] = $cash;
$arr["pos"] = $pos; $arr["pos"] = $pos;
$arr["other_bank"] = $other_bank; $arr["other_bank"] = $other_bank;
$arr["bank_card"] = $bank_card;
$arr["tenpay_2"] = $tenpay_2; $arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2; $arr["alipay_2"] = $alipay_2;
$arr["site_id"] = $site_id; $arr["site_id"] = $site_id;
...@@ -525,7 +527,7 @@ class DailyPaperService ...@@ -525,7 +527,7 @@ class DailyPaperService
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, public function addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status) $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card)
{ {
$agent_info_arr["agent_id"] = $agent_id; $agent_info_arr["agent_id"] = $agent_id;
$agent_info_field = "id,name,store_id,district_id,level"; $agent_info_field = "id,name,store_id,district_id,level";
...@@ -541,7 +543,7 @@ class DailyPaperService ...@@ -541,7 +543,7 @@ class DailyPaperService
return ["code" => 101, "msg" => "您已经审核过了"]; return ["code" => 101, "msg" => "您已经审核过了"];
} }
$params = $this->dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $params = $this->dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status); $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
$is_ok = $this->oDailyLogModel->addDailyCheck($params); $is_ok = $this->oDailyLogModel->addDailyCheck($params);
...@@ -578,7 +580,7 @@ class DailyPaperService ...@@ -578,7 +580,7 @@ class DailyPaperService
* @return mixed * @return mixed
*/ */
public function dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, public function dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status) $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card)
{ {
$arr["daily_id"] = $daily_id; $arr["daily_id"] = $daily_id;
$arr["operation_id"] = $agent_id; $arr["operation_id"] = $agent_id;
...@@ -593,6 +595,9 @@ class DailyPaperService ...@@ -593,6 +595,9 @@ class DailyPaperService
$arr["pos"] = $pos; $arr["pos"] = $pos;
$arr["other_bank"] = $other_bank; $arr["other_bank"] = $other_bank;
$arr["operation_status"] = $operation_status; $arr["operation_status"] = $operation_status;
$arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2;
$arr["bank_card"] = $bank_card;
$arr["create_time"] = date("Y-m-d H:i:s", time()); $arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time()); $arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr; return $arr;
......
application/index/controller/DailyPaper.php
View file @ 1f3ba80f
...@@ -100,9 +100,10 @@ class DailyPaper extends Basic ...@@ -100,9 +100,10 @@ class DailyPaper extends Basic
$cash = $params["cash"]; $cash = $params["cash"];
$pos = $params["pos"]; $pos = $params["pos"];
$other_bank = $params["other_bank"]; $other_bank = $params["other_bank"];
$bank_card = $params["bank_card"];
$site_id = $this->siteId; $site_id = $this->siteId;
$result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id); $family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
...@@ -156,11 +157,14 @@ class DailyPaper extends Basic ...@@ -156,11 +157,14 @@ class DailyPaper extends Basic
$other_bank = $params["other_bank"]; $other_bank = $params["other_bank"];
$remark = $params["remark"]; $remark = $params["remark"];
$operation_status = $params["operation_status"]; $operation_status = $params["operation_status"];
$tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"];
$bank_card = $params["bank_card"];
if($operation_status != 0 && $operation_status != 1){ if($operation_status != 0 && $operation_status != 1){
return $this->response("101", "审核状态错误"); return $this->response("101", "审核状态错误");
} }
$result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
$family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status); $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
......
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