bug

application/api_broker/controller/OrderLog.php

@@ -204,7 +204,7 @@ class OrderLog extends Basic
 
         if (!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"]) ) {
+            !isset($params["house_number"]) || !isset($params["industry_type"]) || !isset($params["transfer_name"]) ) {
             return $this->response("101", "请求参数错误");
         }
 
@@ -226,6 +226,8 @@ class OrderLog extends Basic
              "is_dividend"     => 1, //是否分红 1否 0是
              "last_transfer_time"  => "2018-10-18", //最后转定时间
               "pay_id"         => 1,
+              "receipt_number"   => "12312",
+              "transfer_name"    => "sdafsdf",
          );*/
 
 
@@ -237,13 +239,16 @@ class OrderLog extends Basic
         $income_time    = isset($params["income_time"]) ? $params["income_time"] : "";
         $pay_id         = isset($params["pay_id"]) ? $params["pay_id"] : 0;
         $source         = $params["source"] ? $params["source"] : 0;
+        $receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : "";
+        $transfer_name  = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
         if($pay_id > 0){
             $source = 2;
         }
 
         $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"],$params["last_transfer_time"],$pay_id);
+            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$params["last_transfer_time"],$pay_id,
+            $receipt_number,$transfer_name);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);

application/api_broker/service/OrderLogService.php

@@ -105,6 +105,9 @@ class OrderLogService
      * @param $income_time
      * @param $is_dividend
      * @param $last_transfer_time
+     * @param $pay_id
+     * @param $receipt_number
+     * @param $transfer_name
      * @return int|string
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -113,7 +116,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)
+                                      $last_transfer_time, $pay_id,$receipt_number,$transfer_name)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -121,18 +124,20 @@ class OrderLogService
         $type = 0;
         foreach ($collecting_bill as $collecting) {
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
-                if (!$this->verifyType($collecting["type"], $collecting["pay_type"], $is_dividend, $last_transfer_time)) {
+                if (!$this->verifyType($collecting["type"], $collecting["pay_type"],$receipt_number)) {
                     return -1;
                 }
                 $money = $collecting["money"];
                 $type = $collecting["type"];
                 if ($father_id == 0) {
-                    $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend, $last_transfer_time);
+                    $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $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);
                     $father_id = $this->payLogModel->insertPayLog($params);
                 } else {
-                    array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend, $last_transfer_time));
+                    array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name,
+                        $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));
                 }
             }
         }
@@ -161,11 +166,10 @@ class OrderLogService
     /**
      * @param $type
      * @param $pay_type
-     * @param $is_dividend
-     * @param $last_transfer_time
+     * @param $receipt_number
      * @return bool
      */
-    private function verifyType($type, $pay_type, $is_dividend, $last_transfer_time)
+    private function verifyType($type, $pay_type,$receipt_number)
     {
 
         switch ($pay_type) {
@@ -194,8 +198,14 @@ class OrderLogService
         }
         switch ($type) {
             case 10:
+                if(empty($receipt_number)){
+                    return false;
+                }
                 break;
             case 30:
+                if(empty($receipt_number)){
+                    return false;
+                }
                 break;
             case 20:
                 break;
@@ -237,10 +247,13 @@ class OrderLogService
      * @param $income_time
      * @param $is_dividend
      * @param $last_transfer_time
+     * @param $receipt_number
+     * @param $transfer_name
      * @return mixed
      */
-    private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id, $order_no, $house_number,
-                                       $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend, $last_transfer_time)
+    private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $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)
     {
 
         $arr["report_id"] = $report_id;
@@ -256,6 +269,8 @@ class OrderLogService
         $arr["house_number"] = $house_number;
         $arr["industry_type"] = $industry_type;
         $arr["remark"] = $remark;
+        $arr["receipt_number"] = $receipt_number;
+        $arr["transfer_name"] = $transfer_name;
         $arr["transfer_img"] = $transfer_img;
         $arr["create_time"] = date("Y-m-d H:i:s", time());
         $arr["update_time"] = date("Y-m-d H:i:s", time());