1

application/api_broker/controller/DailyPaper.php

@@ -120,9 +120,10 @@ class DailyPaper extends Basic
         $bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 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_sz  = $params["bank_card_sz"] ? $params["bank_card_sz"] : 0;
         $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
-            , $bank_card_lin, $bank_card_new);
+            , $bank_card_lin, $bank_card_new, $bank_card_sz);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {
@@ -180,5 +181,4 @@ class DailyPaper extends Basic
     }
 
 
-
 }
\ No newline at end of file

application/api_broker/service/DailyPaperService.php

@@ -199,7 +199,8 @@ class DailyPaperService
         $total["private_bank"] = 0;
         $total["cash"]         = 0;
         $total["other_bank"]   = 0;
-        $total["bank_card"]    = 0;
+        $total["bank_card"]    = 0; //上海银满谷
+        $total["bank_card_sz"] = 0; //深圳银满谷
         //71 筠姐上海银行卡 72林老师建行卡  73新同联福居银行卡  74陈志杰招商
         $total["bank_card_yun"]  = 0;
         $total["bank_card_lin"]  = 0;
@@ -267,6 +268,9 @@ class DailyPaperService
                 case 74:
                     $total["bank_card_chen"] += $item["money"];
                     break;
+                case 75:
+                    $total["bank_card_sz"] += $item["money"];
+                    break;
             }
         }
         return $total;
@@ -614,7 +618,7 @@ class DailyPaperService
      */
     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,
-                             $bank_card_yun, $bank_card_lin, $bank_card_new)
+                             $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz)
     {
         $agent_info_arr["agent_id"] = $agent_id;
         $agent_info_field           = "id,name,store_id,district_id,level";
@@ -634,7 +638,7 @@ 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"],
-            $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun, $bank_card_lin, $bank_card_new);
+            $tenpay_2, $alipay_2, $site_id, $bank_card, $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz);
         $is_ok  = $this->oDailyModel->addDaily($params);
         if ($is_ok > 0) {
             //更新财务日报未提交记录表数据
@@ -648,7 +652,7 @@ 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,
-                             $bank_card_yun, $bank_card_lin, $bank_card_new)
+                             $bank_card_yun, $bank_card_lin, $bank_card_new, $bank_card_sz)
     {
         $arr["agent_id"]      = $agent_id;
         $arr["agent_name"]    = $agent_name;
@@ -670,6 +674,7 @@ class DailyPaperService
         $arr["bank_card_yun"] = $bank_card_yun;
         $arr["bank_card_lin"] = $bank_card_lin;
         $arr["bank_card_new"] = $bank_card_new;
+        $arr["bank_card_sz"]  = $bank_card_sz;
         $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

@@ -110,10 +110,11 @@ class DailyPaper extends Basic
         $bank_card_yun = $params["bank_card_yun"] ? $params["bank_card_yun"] : 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_sz  = $params["bank_card_sz"] ? $params["bank_card_sz"] : 0;
         $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, $bank_card_yun
-            , $bank_card_lin, $bank_card_new);
+            , $bank_card_lin, $bank_card_new, $bank_card_sz);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {
@@ -193,7 +194,7 @@ class DailyPaper extends Basic
         }
         $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,
-            $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);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {
@@ -312,12 +313,12 @@ class DailyPaper extends Basic
         }
 
         $m_daily  = new ODaily();
-        $daily_id = $m_daily->getFieldValue('id', ['id'=>$this->params['daily_id'], 'status'=>1]);
+        $daily_id = $m_daily->getFieldValue('id', ['id' => $this->params['daily_id'], 'status' => 1]);
         if (empty($daily_id)) {
             return $this->response("101", "没有该数据");
         }
 
-        $num = $m_daily->updateDaily(['status'=>0], ['id'=>$daily_id]);
+        $num = $m_daily->updateDaily(['status' => 0], ['id' => $daily_id]);
         if ($num > 0) {
             $code = 200;
             $msg  = '转到审核中成功';