bug

application/api_broker/service/DailyPaperService.php

@@ -424,7 +424,12 @@ class DailyPaperService
         }
         $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"]);
-        return $this->oDailyModel->addDaily($params);
+        $is_ok = $this->oDailyModel->addDaily($params);
+        if ($is_ok > 0) {
+            return ["code" => 200, "data" => null];
+        } else {
+            return ["code" => 101, "msg" => "审核异常"];
+        }
     }
 
     public function dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
@@ -488,13 +493,19 @@ class DailyPaperService
             $family_pay, $private_bank, $cash, $pos, $other_bank,  $remark,$operation_status);
 
         $is_ok =  $this->oDailyLogModel->addDailyCheck($params);
-        if($is_ok > 0 && $operation_status == 1){//修改主表审核状态
-            $update_where["id"]           = $daily_id;
-            $update_params["status"]      = 1;
-            $update_params["update_time"] = date("Y-m-d H:i:s",time());
-            $this->oDailyModel->updateDaily($update_where,$update_params);
+
+        if($is_ok > 0){
+            if($operation_status == 1){//修改主表审核状态
+                $update_where["id"]           = $daily_id;
+                $update_params["status"]      = 1;
+                $update_params["update_time"] = date("Y-m-d H:i:s",time());
+                $this->oDailyModel->updateDaily($update_where,$update_params);
+            }
+            return ["code" => 200, "data"=>null];
+        }else{
+            return ["code" => 101, "msg" => "审核异常"];
         }
-        return $is_ok;
+
 
     }
 

application/index/controller/DailyPaper.php

@@ -96,12 +96,12 @@ class DailyPaper extends Basic
         $cash = $params["cash"];
         $pos = $params["agent_id"];
         $other_bank = $params["other_bank"];
-        $is_ok = $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);
-        if($is_ok > 0){
-            return $this->response("200","success",[]);
-        }else{
-            return $this->response("101", "保存数据异常");
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else {
+            return $this->response("200", "success", $result["data"]);
         }
     }
 
@@ -114,21 +114,21 @@ class DailyPaper extends Basic
      */
     public function commitCheck(){
         $params = $this->params;
-          /* $params = array(
-                "daily_id"    => 1,//日报id
-               "agent_id"     => 5775,//经纪人id
-               "agent_name"   => "222",//经纪人姓名
-               "alipay"       => "12",//支付宝收款
-               "tenpay"       => "2323",//微信收款
-               "realty_pay"   => "232",//地产转帐
-               "family_pay"   => "444",//世家公账
-               "private_bank" => "55",//3000账号
-               "cash"         => "666",//现金
-               "pos"          => "777",//pos机
-               "other_bank"   => "888",//其他,
-               "operation_status"   => 0,//0审核通过 1转为已审核
-               "remark"   => "888"//备注,
-           );*/
+        /*$params = array(
+            "daily_id"         => 1,//日报id
+            "agent_id"         => 5775,//经纪人id
+            "agent_name"       => "222",//经纪人姓名
+            "alipay"           => "12",//支付宝收款
+            "tenpay"           => "2323",//微信收款
+            "realty_pay"       => "232",//地产转帐
+            "family_pay"       => "444",//世家公账
+            "private_bank"     => "55",//3000账号
+            "cash"             => "666",//现金
+            "pos"              => "777",//pos机
+            "other_bank"       => "888",//其他,
+            "operation_status" => 1,//0审核通过 1转为已审核
+            "remark"           => "888"//备注,
+        );*/
         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"]) ||
@@ -150,12 +150,12 @@ class DailyPaper extends Basic
         $other_bank = $params["other_bank"];
         $remark = $params["remark"];
         $operation_status = $params["operation_status"];
-        $is_ok = $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);
-        if($is_ok > 0){
-            return $this->response("200","success",[]);
-        }else{
-            return $this->response("101", "保存数据异常");
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else {
+            return $this->response("200", "success", $result["data"]);
         }
     }