bug

application/api_broker/service/DailyPaperService.php

@@ -461,13 +461,14 @@ class DailyPaperService
      * @param $pos
      * @param $other_bank
      * @param $remark
+     * @param $operation_status
      * @return array|int
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
     public function addDailyCheck($daily_id, $agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-                                  $family_pay, $private_bank, $cash, $pos, $other_bank, $remark)
+                                  $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status)
     {
         $agent_info_arr["agent_id"] = $agent_id;
         $agent_info_field = "id,name,store_id,district_id,level";
@@ -483,9 +484,17 @@ class DailyPaperService
             return ["code" => 101, "msg" => "您已经审核过了"];
         }
         $params = $this->dailyLogBin($daily_id, $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"], $remark);
+            $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);
+        }
+        return $is_ok;
 
-        return $this->oDailyLogModel->addDailyCheck($params);
     }
 
 
@@ -502,13 +511,12 @@ class DailyPaperService
      * @param $cash
      * @param $pos
      * @param $other_bank
-     * @param $store_id
-     * @param $district_id
      * @param $remark
+     * @param $operation_status
      * @return mixed
      */
     public function dailyLogBin($daily_id, $agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-                                $family_pay, $private_bank, $cash, $pos, $other_bank, $store_id, $district_id, $remark)
+                                $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status)
     {
         $arr["daily_id"] = $daily_id;
         $arr["operation_id"] = $agent_id;
@@ -523,6 +531,7 @@ class DailyPaperService
         $arr["cash"] = $cash;
         $arr["pos"] = $pos;
         $arr["other_bank"] = $other_bank;
+        $arr["operation_status"] = $operation_status;
         $arr["create_time"] = date("Y-m-d H:i:s", time());
         $arr["update_time"] = date("Y-m-d H:i:s", time());
         return $arr;

application/index/controller/DailyPaper.php

@@ -127,12 +127,13 @@ class DailyPaper extends Basic
                "cash"         => "666",//现金
                "pos"          => "777",//pos机
                "other_bank"   => "888"//其他,
+               "operation_status"   => 0//0审核通过 1转为已审核
                "remark"   => "888"//备注,
            );*/
         if (!isset($params["daily_id"]) || 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["operation_status"])
         ) {
             return $this->response("101", "请求参数错误");
         }
@@ -150,8 +151,9 @@ class DailyPaper extends Basic
         $pos = $params["agent_id"];
         $other_bank = $params["other_bank"];
         $remark = $params["remark"];
+        $operation_status = $params["operation_status"];
         $is_ok = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark);
+            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status);
         if($is_ok > 0){
             return $this->response("200","success",[]);
         }else{

application/model/ODaily.php

 <?php
+
 namespace app\model;
 
 use think\Db;
@@ -11,7 +12,8 @@ use think\Model;
  * Time : 11:26 AM
  * Intro:
  */
-class ODaily extends BaseModel{
+class ODaily extends BaseModel
+{
 
     protected $table = "o_daily";
     private $db_;
@@ -32,12 +34,13 @@ class ODaily extends BaseModel{
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getDailyList($field,$params,$page_no,$page_size){
+    public function getDailyList($field, $params, $page_no, $page_size)
+    {
         $where_ = [];
-        if(isset($params["agent_id"])){
+        if (isset($params["agent_id"])) {
             $where_["agent_id"] = $params["agent_id"];
         }
-        if(isset($params["daily_date"])){
+        if (isset($params["daily_date"])) {
             $where_["daily_date"] = $params["daily_date"];
         }
         $where_["is_del"] = 0;
@@ -53,7 +56,8 @@ class ODaily extends BaseModel{
      * @param $params
      * @return int
      */
-    public function addDaily($params){
+    public function addDaily($params)
+    {
         Db::startTrans();
         try {
             $this->db_->insert($params);
@@ -64,4 +68,22 @@ class ODaily extends BaseModel{
             return 0;
         }
     }
+
+    /**
+     * @param $where
+     * @param $params
+     * @return int
+     */
+    public function updateDaily($where,$params)
+    {
+        Db::startTrans();
+        try {
+            $this->where($where)->update($params);
+            Db::commit();
+            return 1;
+        } catch (\Exception $e) {
+            Db::rollback();
+            return 0;
+        }
+    }
 }
\ No newline at end of file