Commit f44abb7c authored by zw's avatar zw

bug

parent 83ceb4fb
...@@ -468,7 +468,7 @@ class DailyPaperService ...@@ -468,7 +468,7 @@ class DailyPaperService
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function addDailyCheck($daily_id, $agent_id, $agent_name, $daily_date, $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)
{ {
$agent_info_arr["agent_id"] = $agent_id; $agent_info_arr["agent_id"] = $agent_id;
...@@ -484,7 +484,7 @@ class DailyPaperService ...@@ -484,7 +484,7 @@ class DailyPaperService
if(count($dailyInfo) > 0 ){ if(count($dailyInfo) > 0 ){
return ["code" => 101, "msg" => "您已经审核过了"]; return ["code" => 101, "msg" => "您已经审核过了"];
} }
$params = $this->dailyLogBin($daily_id, $agent_id, $agent_name, $daily_date, $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);
$is_ok = $this->oDailyLogModel->addDailyCheck($params); $is_ok = $this->oDailyLogModel->addDailyCheck($params);
...@@ -503,7 +503,6 @@ class DailyPaperService ...@@ -503,7 +503,6 @@ class DailyPaperService
* @param $daily_id * @param $daily_id
* @param $agent_id * @param $agent_id
* @param $agent_name * @param $agent_name
* @param $daily_date
* @param $alipay * @param $alipay
* @param $tenpay * @param $tenpay
* @param $realty_pay * @param $realty_pay
...@@ -516,14 +515,13 @@ class DailyPaperService ...@@ -516,14 +515,13 @@ class DailyPaperService
* @param $operation_status * @param $operation_status
* @return mixed * @return mixed
*/ */
public function dailyLogBin($daily_id, $agent_id, $agent_name, $daily_date, $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)
{ {
$arr["daily_id"] = $daily_id; $arr["daily_id"] = $daily_id;
$arr["operation_id"] = $agent_id; $arr["operation_id"] = $agent_id;
$arr["operation_name"] = $agent_name; $arr["operation_name"] = $agent_name;
$arr["remark"] = $remark; $arr["remark"] = $remark;
$arr["daily_date"] = $daily_date;
$arr["alipay"] = $alipay; $arr["alipay"] = $alipay;
$arr["tenpay"] = $tenpay; $arr["tenpay"] = $tenpay;
$arr["realty_pay"] = $realty_pay; $arr["realty_pay"] = $realty_pay;
......
...@@ -114,11 +114,10 @@ class DailyPaper extends Basic ...@@ -114,11 +114,10 @@ class DailyPaper extends Basic
*/ */
public function commitCheck(){ public function commitCheck(){
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"daily_id" => 1,//日报id "daily_id" => 1,//日报id
"agent_id" => 5775,//经纪人id "agent_id" => 5775,//经纪人id
"agent_name" => "222",//经纪人姓名 "agent_name" => "222",//经纪人姓名
"daily_date" => "2018-12-02",//日报日期
"alipay" => "12",//支付宝收款 "alipay" => "12",//支付宝收款
"tenpay" => "2323",//微信收款 "tenpay" => "2323",//微信收款
"realty_pay" => "232",//地产转帐 "realty_pay" => "232",//地产转帐
...@@ -126,11 +125,11 @@ class DailyPaper extends Basic ...@@ -126,11 +125,11 @@ class DailyPaper extends Basic
"private_bank" => "55",//3000账号 "private_bank" => "55",//3000账号
"cash" => "666",//现金 "cash" => "666",//现金
"pos" => "777",//pos机 "pos" => "777",//pos机
"other_bank" => "888"//其他, "other_bank" => "888",//其他,
"operation_status" => 0//0审核通过 1转为已审核 "operation_status" => 0,//0审核通过 1转为已审核
"remark" => "888"//备注, "remark" => "888"//备注,
);*/ );*/
if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) || 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["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
!isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) || !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"])
...@@ -141,7 +140,6 @@ class DailyPaper extends Basic ...@@ -141,7 +140,6 @@ class DailyPaper extends Basic
$daily_id = $params["daily_id"]; $daily_id = $params["daily_id"];
$agent_id = $params["agent_id"]; $agent_id = $params["agent_id"];
$agent_name = $params["agent_name"]; $agent_name = $params["agent_name"];
$daily_date = $params["daily_date"];
$alipay = $params["alipay"]; $alipay = $params["alipay"];
$tenpay = $params["tenpay"]; $tenpay = $params["tenpay"];
$realty_pay = $params["realty_pay"]; $realty_pay = $params["realty_pay"];
...@@ -152,7 +150,7 @@ class DailyPaper extends Basic ...@@ -152,7 +150,7 @@ 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"];
$is_ok = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay, $is_ok = $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);
if($is_ok > 0){ if($is_ok > 0){
return $this->response("200","success",[]); return $this->response("200","success",[]);
......
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