Skip to content

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

财务日报

parent 8d7fac6d
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 35 deletions
application/api_broker/service/DailyPaperService.php
View file @ c3ed0e65
......@@ -182,6 +182,10 @@ class DailyPaperService
$total["cash"] = 0;
$total["other_bank"] = 0;
$total["bank_card"] = 0;
//71 筠姐上海银行卡 72林老师建行卡 73新同联福居银行卡
$total["bank_card_yun"] = 0;
$total["bank_card_lin"] = 0;
$total["bank_card_new"] = 0;
if (count($total_arr) <= 0) {
return $total;
}
......@@ -226,6 +230,15 @@ class DailyPaperService
case 70:
$total["bank_card"] = $item["money"];
break;
case 71:
$total["bank_card_yun"] = $item["money"];
break;
case 72:
$total["bank_card_lin"] = $item["money"];
break;
case 73:
$total["bank_card_new"] = $item["money"];
break;
}
}
return $total;
......@@ -475,7 +488,8 @@ class DailyPaperService
* @throws \think\exception\DbException
*/
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)
{
$agent_info_arr["agent_id"] = $agent_id;
$agent_info_field = "id,name,store_id,district_id,level";
......@@ -494,7 +508,8 @@ class DailyPaperService
return ["code" => 101, "msg" => "请勿重复提交日报"];
}
$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, $bank_card);
$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);
$is_ok = $this->oDailyModel->addDaily($params);
if ($is_ok > 0) {
return ["code" => 200, "data" => null];
......@@ -503,8 +518,9 @@ class DailyPaperService
}
}
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)
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,
$bank_card_yun ,$bank_card_lin,$bank_card_new)
{
$arr["agent_id"] = $agent_id;
$arr["agent_name"] = $agent_name;
......@@ -523,11 +539,15 @@ class DailyPaperService
$arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2;
$arr["site_id"] = $site_id;
$arr["bank_card_yun"] = $bank_card_yun;
$arr["bank_card_lin"] = $bank_card_lin;
$arr["bank_card_new"] = $bank_card_new;
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr;
}
/**
* @param $daily_id
* @param $agent_id
......@@ -542,13 +562,20 @@ class DailyPaperService
* @param $other_bank
* @param $remark
* @param $operation_status
* @return array|int
* @param $tenpay_2
* @param $alipay_2
* @param $bank_card
* @param $bank_card_yun
* @param $bank_card_lin
* @param $bank_card_new
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
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)
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,
$bank_card_yun ,$bank_card_lin,$bank_card_new)
{
$agent_info_arr["agent_id"] = $agent_id;
$agent_info_field = "id,name,store_id,district_id,level";
......@@ -564,7 +591,8 @@ class DailyPaperService
return ["code" => 101, "msg" => "您已经审核过了"];
}
$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);
$is_ok = $this->oDailyLogModel->addDailyCheck($params);
......@@ -598,10 +626,17 @@ class DailyPaperService
* @param $other_bank
* @param $remark
* @param $operation_status
* @param $tenpay_2
* @param $alipay_2
* @param $bank_card
* @param $bank_card_yun
* @param $bank_card_lin
* @param $bank_card_new
* @return mixed
*/
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)
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,
$bank_card_yun ,$bank_card_lin,$bank_card_new)
{
$arr["daily_id"] = $daily_id;
$arr["operation_id"] = $agent_id;
......@@ -619,6 +654,9 @@ class DailyPaperService
$arr["tenpay_2"] = $tenpay_2;
$arr["alipay_2"] = $alipay_2;
$arr["bank_card"] = $bank_card;
$arr["bank_card_yun"] = $bank_card_yun;
$arr["bank_card_lin"] = $bank_card_lin;
$arr["bank_card_new"] = $bank_card_new;
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr;
......@@ -638,7 +676,7 @@ class DailyPaperService
private function getDailyInfo($store_id, $daily_data,$type = 0)
{
$field_info_field = "id,agent_id,agent_name,daily_date,alipay,tenpay,realty_pay,family_pay,private_bank,
cash,pos,other_bank,status,create_time,update_time,alipay_2,tenpay_2,site_id,bank_card";
cash,pos,other_bank,status,create_time,update_time,alipay_2,tenpay_2,site_id,bank_card,bank_card_yun,bank_card_lin,bank_card_new";
if($type == 1){
$daily_info_params["agent_id"] = $store_id;
}else{
......
application/index/controller/DailyPaper.php
View file @ c3ed0e65
......@@ -78,25 +78,19 @@ class DailyPaper extends Basic
"private_bank" => "55",//3000账号
"cash" => "666",//现金
"pos" => "777",//pos机
"other_bank" => "888"//其他
"other_bank" => "888",//其他
"bank_card_yun" => "2323",
"bank_card_lin"=>"1213",
"bank_card_new"=>"123123"
);*/
if ($this->siteId == 10003) {
if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
!isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params['bank_card'])
) {
return $this->response("101", "请求参数错误");
}
} else {
if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
!isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
!isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
!isset($params["pos"]) || !isset($params["other_bank"])
!isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["bank_card_yun"])
|| !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"])
) {
return $this->response("101", "请求参数错误");
}
}
$agent_id = $params["agent_id"];
$agent_name = $params["agent_name"];
......@@ -112,9 +106,13 @@ class DailyPaper extends Basic
$pos = $params["pos"];
$other_bank = $params["other_bank"];
$bank_card = $params["bank_card"];
$bank_card_yun = $params["bank_card_yun"];
$bank_card_lin = $params["bank_card_lin"];
$bank_card_new = $params["bank_card_new"];
$site_id = $this->siteId;
$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);
$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);
if ($result["code"] == 101) {
return $this->response("101", $result["msg"]);
} else {
......@@ -146,6 +144,9 @@ class DailyPaper extends Basic
"other_bank" => "888",//其他,
"operation_status" => 1,//0审核通过 1转为已审核
"remark" => "888"//备注,
"bank_card_yun" => "2323",
"bank_card_lin"=>"1213",
"bank_card_new"=>"123123"
);*/
// if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
// !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
......@@ -160,22 +161,14 @@ class DailyPaper extends Basic
if (empty($daily_data)) {
return $this->response(101, '没有该记录，审核失败');
}
if ($daily_data[0]['site_id'] == 10003) {
if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_id"]) ||
!isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params['bank_card']) || !isset($params["operation_status"])
) {
return $this->response("101", "请求参数错误");
}
} else {
if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
!isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
!isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
!isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
!isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"]) ||
!isset($params["bank_card_yun"]) || !isset($params["bank_card_lin"]) || !isset($params["bank_card_new"])
) {
return $this->response("101", "请求参数错误");
}
}
$daily_id = $params["daily_id"];
$agent_id = $params["agent_id"];
......@@ -193,11 +186,15 @@ class DailyPaper extends Basic
$tenpay_2 = $params["tenpay_2"];
$alipay_2 = $params["alipay_2"];
$bank_card = $params["bank_card"];
$bank_card_yun = $params["bank_card_yun"];
$bank_card_lin = $params["bank_card_lin"];
$bank_card_new = $params["bank_card_new"];
if($operation_status != 0 && $operation_status != 1){
return $this->response("101", "审核状态错误");
}
$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);
if ($result["code"] == 101) {
return $this->response("101", $result["msg"]);
} 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