收款is_open

application/api_broker/controller/OrderLog.php

@@ -213,7 +213,8 @@ class OrderLog extends Basic
         $received_money = isset($params["received_money"]) ? $params["received_money"] : "";
         $type_ext       = isset($params["type_ext"]) ? $params["type_ext"] : "";
         $bargain_id     = isset($params['bargain_id']) ? $params['bargain_id'] : 0;
-        $is_ok          = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id);
+        $is_open        = isset($params['is_open']) ? $params['is_open'] : -1;
+        $is_ok          = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id, $is_open);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", ["bill_id" => $is_ok]);
@@ -278,6 +279,7 @@ class OrderLog extends Basic
         $transfer_name      = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
         $received_money     = isset($params["received_money"]) ? $params["received_money"] : 0;
         $type_ext           = isset($params["type_ext"]) ? $params["type_ext"] : 0;
+        $is_open            = isset($params['is_open']) ? $params['is_open'] : -1;
         if ($pay_id > 0) {
             $source = 2;
         }
@@ -285,7 +287,7 @@ class OrderLog extends Basic
         $is_ok = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
             $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
             $remark, $transfer_img, $source, $income_time, $params["is_dividend"], $last_transfer_time, $pay_id,
-            $receipt_number, $transfer_name, $received_money, $type_ext, $params['bargain_id']);
+            $receipt_number, $transfer_name, $received_money, $type_ext, $params['bargain_id'], $is_open);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", ["bill_id" => $is_ok]);

application/api_broker/service/OrderLogService.php

@@ -66,7 +66,7 @@ class OrderLogService
      * @throws \think\exception\DbException
      */
     public function addCollectingBillV2($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
-                                        $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id)
+                                        $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id, $is_open)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -81,7 +81,7 @@ class OrderLogService
                         $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext, $bargain_id));
                 }
 
-                $this->updateBargainIsOpen($bargain_id, $collecting['type']);
+                $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
             }
         }
         if ($father_id > 0) {
@@ -129,7 +129,7 @@ class OrderLogService
      */
     public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
                                       $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
-                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id)
+                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id, $is_open)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -158,7 +158,7 @@ class OrderLogService
                         $report_id, $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
                         $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id));
                 }
-                $this->updateBargainIsOpen($bargain_id, $collecting['type']);
+                $this->updateBargainIsOpen($bargain_id, $collecting['type'], $is_open);
             }
         }
         if ($father_id > 0) {
@@ -1797,14 +1797,19 @@ class OrderLogService
      *
      * @param $bargain_id
      * @param $type
+     * @param $is_open
      * @return bool|int
      */
-    public function updateBargainIsOpen($bargain_id, $type) {
+    public function updateBargainIsOpen($bargain_id, $type, $is_open) {
         if (empty($bargain_id) && !in_array($type, [91,92])) {
             return false;
         }
 
-        $num = $this->bargainModel->updateBargainById($bargain_id, ['is_open'=>1]);
+        if ($is_open != 0 || $is_open != 1) {
+            return false;
+        }
+
+        $num = $this->bargainModel->updateBargainById($bargain_id, ['is_open'=>$is_open]);
         if ($num) {
             $result = 1;
         } else {

application/index/controller/Finance.php

@@ -3737,13 +3737,14 @@ class Finance extends Basic
         $transfer_name  = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
         $received_money  = isset($params["received_money"]) ? $params["received_money"] : 0;
         $type_ext  = isset($params["type_ext"]) ? $params["type_ext"] : 0;
+        $is_open        = isset($params['is_open']) ? $params['is_open'] : -1;
         if($pay_id > 0){
             $source = 2;
         }
         $service_ = new OrderLogService();
         $is_ok = $service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
             $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
-            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id']);
+            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id'], $is_open);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);