Skip to content

T
tl_estate
Commit ae95d925 authored by clone's avatar clone
Browse files
Options

1

parent f6fa2048
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 13 deletions
application/api_broker/controller/DailyPaper.php
View file @ ae95d925
...@@ -107,8 +107,12 @@ class DailyPaper extends Basic ...@@ -107,8 +107,12 @@ class DailyPaper extends Basic
$daily_date = $params["daily_date"]; $daily_date = $params["daily_date"];
$alipay = $params["alipay"]; $alipay = $params["alipay"];
$tenpay = $params["tenpay"]; $tenpay = $params["tenpay"];
$alipay_1 = $params["alipay"];
$tenpay_1 = $params["tenpay"];
$tenpay_2 = $params["tenpay_2"]; $tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"]; $alipay_2 = $params["alipay_2"];
$tenpay_3 = $params["tenpay_3"];
$alipay_3 = $params["alipay_3"];
$realty_pay = $params["realty_pay"]; $realty_pay = $params["realty_pay"];
$private_bank = $params["private_bank"]; $private_bank = $params["private_bank"];
$family_pay = $params["family_pay"]; $family_pay = $params["family_pay"];
...@@ -123,7 +127,7 @@ class DailyPaper extends Basic ...@@ -123,7 +127,7 @@ class DailyPaper extends Basic
$bank_card_sz = $params["bank_card_sz"] ? $params["bank_card_sz"] : 0; $bank_card_sz = $params["bank_card_sz"] ? $params["bank_card_sz"] : 0;
$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, $bank_card, $bank_card_yun $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun
, $bank_card_lin, $bank_card_new, $bank_card_sz); , $bank_card_lin, $bank_card_new, $bank_card_sz, $tenpay_1, $alipay_1, $tenpay_3, $alipay_3);
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 @ ae95d925
...@@ -218,7 +218,7 @@ class DailyPaperService ...@@ -218,7 +218,7 @@ class DailyPaperService
$total["alipay_2"] += $item["money"]; $total["alipay_2"] += $item["money"];
break; break;
case 12: case 12:
$total["alipay"] += $item["money"]; $total["alipay_1"] += $item["money"];
break; break;
case 13: case 13:
$total["alipay_3"] += $item["money"]; $total["alipay_3"] += $item["money"];
...@@ -230,7 +230,7 @@ class DailyPaperService ...@@ -230,7 +230,7 @@ class DailyPaperService
$total["tenpay_2"] += $item["money"]; $total["tenpay_2"] += $item["money"];
break; break;
case 22: case 22:
$total["tenpay"] += $item["money"]; $total["tenpay_1"] += $item["money"];
break; break;
case 23: case 23:
$total["tenpay_3"] += $item["money"]; $total["tenpay_3"] += $item["money"];
...@@ -618,7 +618,7 @@ class DailyPaperService ...@@ -618,7 +618,7 @@ class DailyPaperService
*/ */
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, $bank_card, $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz) $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz,$tenpay_1,$alipay_1,$tenpay_3,$alipay_3)
{ {
$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";
...@@ -638,7 +638,8 @@ class DailyPaperService ...@@ -638,7 +638,8 @@ class DailyPaperService
} }
$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"], $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, $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz); $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz,
$tenpay_1,$alipay_1,$tenpay_3,$alipay_3);
$is_ok = $this->oDailyModel->addDaily($params); $is_ok = $this->oDailyModel->addDaily($params);
if ($is_ok > 0) { if ($is_ok > 0) {
//更新财务日报未提交记录表数据 //更新财务日报未提交记录表数据
...@@ -652,7 +653,7 @@ class DailyPaperService ...@@ -652,7 +653,7 @@ class DailyPaperService
public function dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $family_pay, $private_bank, 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, $bank_card, $cash, $pos, $other_bank, $store_id, $district_id, $tenpay_2, $alipay_2, $site_id, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz) $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz,$tenpay_1,$alipay_1,$tenpay_3,$alipay_3)
{ {
$arr["agent_id"] = $agent_id; $arr["agent_id"] = $agent_id;
$arr["agent_name"] = $agent_name; $arr["agent_name"] = $agent_name;
...@@ -668,8 +669,12 @@ class DailyPaperService ...@@ -668,8 +669,12 @@ class DailyPaperService
$arr["pos"] = $pos; $arr["pos"] = $pos;
$arr["other_bank"] = $other_bank; $arr["other_bank"] = $other_bank;
$arr["bank_card"] = $bank_card; $arr["bank_card"] = $bank_card;
$arr["tenpay_1"] = $tenpay_1;
$arr["alipay_1"] = $alipay_1;
$arr["tenpay_2"] = $tenpay_2; $arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2; $arr["alipay_2"] = $alipay_2;
$arr["tenpay_3"] = $tenpay_3;
$arr["alipay_3"] = $alipay_3;
$arr["site_id"] = $site_id; $arr["site_id"] = $site_id;
$arr["bank_card_yun"] = $bank_card_yun; $arr["bank_card_yun"] = $bank_card_yun;
$arr["bank_card_lin"] = $bank_card_lin; $arr["bank_card_lin"] = $bank_card_lin;
...@@ -708,7 +713,8 @@ class DailyPaperService ...@@ -708,7 +713,8 @@ class DailyPaperService
*/ */
public function addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $family_pay, $private_bank, public function addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $family_pay, $private_bank,
$cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3) $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3,
$tenpay_1, $alipay_1, $bank_card_sz)
{ {
$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";
...@@ -725,7 +731,7 @@ class DailyPaperService ...@@ -725,7 +731,7 @@ class DailyPaperService
} }
$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, $tenpay_2, $alipay_2, $bank_card, $family_pay, $private_bank, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3); $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3, $tenpay_1, $alipay_1, $bank_card_sz);
$is_ok = $this->oDailyLogModel->addDailyCheck($params); $is_ok = $this->oDailyLogModel->addDailyCheck($params);
...@@ -769,7 +775,8 @@ class DailyPaperService ...@@ -769,7 +775,8 @@ class DailyPaperService
*/ */
public function dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $family_pay, $private_bank, public function dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay, $family_pay, $private_bank,
$cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3) $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3,
$tenpay_1, $alipay_1, $bank_card_sz)
{ {
$arr["daily_id"] = $daily_id; $arr["daily_id"] = $daily_id;
$arr["operation_id"] = $agent_id; $arr["operation_id"] = $agent_id;
...@@ -784,15 +791,19 @@ class DailyPaperService ...@@ -784,15 +791,19 @@ 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_1"] = $tenpay_1;
$arr["alipay_1"] = $alipay_1;
$arr["tenpay_2"] = $tenpay_2; $arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2; $arr["alipay_2"] = $alipay_2;
$arr["alipay_3"] = $alipay_3;
$arr["tenpay_3"] = $tenpay_3;
$arr["bank_card"] = $bank_card; $arr["bank_card"] = $bank_card;
$arr["bank_card_yun"] = $bank_card_yun; $arr["bank_card_yun"] = $bank_card_yun;
$arr["bank_card_lin"] = $bank_card_lin; $arr["bank_card_lin"] = $bank_card_lin;
$arr["bank_card_new"] = $bank_card_new; $arr["bank_card_new"] = $bank_card_new;
$arr["bank_card_new"] = $bank_card_new; $arr["bank_card_new"] = $bank_card_new;
$arr["alipay_3"] = $alipay_3;
$arr["bank_card_chen"] = $bank_card_chen; $arr["bank_card_chen"] = $bank_card_chen;
$arr["bank_card_sz"] = $bank_card_sz;
$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 @ ae95d925
...@@ -97,9 +97,13 @@ class DailyPaper extends Basic ...@@ -97,9 +97,13 @@ class DailyPaper extends Basic
$agent_name = $params["agent_name"]; $agent_name = $params["agent_name"];
$daily_date = $params["daily_date"]; $daily_date = $params["daily_date"];
$alipay = $params["alipay"]; $alipay = $params["alipay"];
$tenpay = $params["tenpay"];
$alipay_1 = $params["alipay"];
$tenpay_1 = $params["tenpay"];
$tenpay_2 = $params["tenpay_2"]; $tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"]; $alipay_2 = $params["alipay_2"];
$tenpay = $params["tenpay"]; $tenpay_3 = $params["tenpay_3"];
$alipay_3 = $params["alipay_3"];
$realty_pay = $params["realty_pay"]; $realty_pay = $params["realty_pay"];
$private_bank = $params["private_bank"]; $private_bank = $params["private_bank"];
$family_pay = $params["family_pay"]; $family_pay = $params["family_pay"];
...@@ -114,7 +118,7 @@ class DailyPaper extends Basic ...@@ -114,7 +118,7 @@ class DailyPaper extends Basic
$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, $bank_card, $bank_card_yun $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun
, $bank_card_lin, $bank_card_new, $bank_card_sz); , $bank_card_lin, $bank_card_new, $bank_card_sz,$tenpay_1,$alipay_1,$tenpay_3,$alipay_3);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["msg"]); return $this->response("101", $result["msg"]);
} else { } else {
...@@ -180,6 +184,8 @@ class DailyPaper extends Basic ...@@ -180,6 +184,8 @@ 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_1 = $params["tenpay_1"];
$alipay_1 = $params["alipay_1"];
$tenpay_2 = $params["tenpay_2"]; $tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"]; $alipay_2 = $params["alipay_2"];
$tenpay_3 = $params["tenpay_3"]; $tenpay_3 = $params["tenpay_3"];
...@@ -189,12 +195,13 @@ class DailyPaper extends Basic ...@@ -189,12 +195,13 @@ class DailyPaper extends Basic
$bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0; $bank_card_lin = $params["bank_card_lin"] ? $params["bank_card_lin"] : 0;
$bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0; $bank_card_new = $params["bank_card_new"] ? $params["bank_card_new"] : 0;
$bank_card_chen = $params["bank_card_chen"] ? $params["bank_card_chen"] : 0; $bank_card_chen = $params["bank_card_chen"] ? $params["bank_card_chen"] : 0;
$bank_card_sz = $params["bank_card_sz"] ? $params["bank_card_sz"] : 0;
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, $tenpay_2, $alipay_2, $bank_card, $family_pay, $private_bank, $cash, $pos, $other_bank, $remark, $operation_status, $tenpay_2, $alipay_2, $bank_card,
$bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3); $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_chen, $tenpay_3, $alipay_3,$tenpay_1, $alipay_1,$bank_card_sz);
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