1

application/api_broker/controller/OrderLog.php

@@ -45,53 +45,6 @@ class OrderLog extends Basic
         $this->verifyService_   = new VerifyRepetitionService();
     }
 
-
-    /**
-     * 进场
-     * @return \think\Response
-     */
-    public function marchIn()
-    {
-        $params = $this->params;
-
-        if (!isset($params["march_in_area"]) || !isset($params["report_id"]) || !isset($params["reception_id"])
-            || !isset($params["reception_name"]) || !isset($params["order_id"]) || !isset($params["order_no"])) {
-            return $this->response("101", "请求参数错误");
-        }
-
-        /*        $params = array(
-                    "reception_id"    => 10010,//带看经纪人id
-                    "reception_name"  => 1,//带看经纪人id
-                    "report_id"       => 1,//报备id
-                    "order_id"        => 1, //关联order表id
-                    "order_no"        => "123123123123123", //订单no
-                    "march_in_remark" => "有意向购买", //进场备注
-                    "march_in_img"    => "123123", //备注图片
-                    "march_in_area"   => "上海市虹口区中山公园", //进场地址
-                );*/
-        // $params["reception_id"] = $this->agentName;
-        //todo 兼容2.9.9bug ios
-        if (isset($params["transfer_img"])) {
-            $transfer_img           = json_decode($params["transfer_img"], true);
-            $params["march_in_img"] = $transfer_img[0];
-            unset($params["transfer_img"]);
-        }
-        $is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
-        if (!$is_execute) {
-            return $this->response("101", "请不要重复提交");
-        }
-        $is_ok = $this->o_march_in_model->addMarchIn($params);
-        if ($is_ok > 0) {
-            $pushMarchIn = new PushMessageService();
-            $pushMarchIn->pushMarchInMessage($params["report_id"], 1, $this->agentId);    //推送
-            return $this->response("200", "request success", []);
-        } else {
-            return $this->response("101", "request faild");
-        }
-
-
-    }
-
     /**
      * @return \think\Response
      * @throws Exception
@@ -143,8 +96,6 @@ class OrderLog extends Basic
         } else {
             return $this->response("101", "request faild");
         }
-
-
     }
 
     /**
@@ -166,62 +117,6 @@ class OrderLog extends Basic
         }
     }
 
-    /**
-     * 收款
-     * @return \think\Response
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function collectingBillV2()
-    {
-        $params = $this->params;
-
-        if (!isset($params["agent_id"]) || !isset($params["agent_id"]) || !isset($params["report_id"]) || !isset($params["order_id"]) || !isset($params["order_no"])
-            || !isset($params["collecting_bill"]) || !isset($params["house_number"]) || !isset($params["industry_type"])) {
-            return $this->response("101", "请求参数错误");
-        }
-        /* $params       = array(
-             "agent_id"  => 1,//收款经纪人id
-             "agent_name"  => 1,//收款经纪人id
-             "report_id" => 111,//报备id
-             "order_id"  => 2, //关联order表id
-             "order_no"  => "123123123", //订单no
-
-             // `type`  '付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他',
-             //`pay_type`  '支付方式 10支付宝 20 微信 30pos机器 40转账 50现金',
-             // `money`  '入账金额 存分',
-             "collecting_bill" => [ { "type" : 10, "pay_type" : 10, "money" : 1100 }, { "type" :10, "pay_type" : 10, "money": 1200 } ],
-             "house_number"    => "3301号",
-             "industry_type"   => "asdasdasd",
-             "remark"          => "没什么备注",
-             "transfer_img"    => "12312312312"
-         );*/
-
-        $vip_services = new VipService();
-        if ($vip_services->vip($params['agent_id'], 'broker/collectingBill')) {
-            return $this->response("101", "没有权限");
-        }
-
-        $params["collecting_bill"] = json_decode($params["collecting_bill"], true);
-
-        $remark       = isset($params["remark"]) ? $params["remark"] : "";
-        $transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"], true) : "";
-        Log::record("********************transfer_img**" . json_encode($transfer_img));
-        $source         = isset($params["source"]) ? $params["source"] : 0;
-        $income_time    = isset($params["income_time"]) ? $params["income_time"] : "";
-        $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_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]);
-        }
-        return $this->response("101", "request faild");
-    }
-
     /**
      * 收款
      * @return \think\Response