入账时间

application/api/controller/Shop.php

@@ -103,7 +103,7 @@ class Shop extends Basic
 
         //c端查对外的名字 b端查对内的名字
         if (isset($params['title'])) {
-            $conditions['external_title'] = array( "like", "%" . trim($params['title']) . "%" );
+            $conditions['external_title|external_address'] = array( "like", "%" . trim($params['title']) . "%" );
         }
 
         //c端查对外的名字 b端查对内的名字

application/api_broker/controller/OrderLog.php

@@ -120,8 +120,9 @@ class OrderLog extends Basic
         $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"] : "";
         $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);
+            $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);

application/api_broker/service/OrderLogService.php

@@ -61,7 +61,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)
+                                        $industry_type, $remark, $transfer_img, $source,$income_time)
     {
         $bill_arr  = $params = [];
         $father_id = 0;
@@ -69,11 +69,11 @@ class OrderLogService
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 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);
+                        $house_number, $industry_type, $remark, $transfer_img, $source,$income_time);
                     $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));
+                        $house_number, $industry_type, $remark, $transfer_img, $source,$income_time));
                 }
             }
         }
@@ -139,7 +139,7 @@ class OrderLogService
     }
 
     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)
+                                       $industry_type, $remark, $transfer_img, $source,$income_time)
     {
 
         $arr["report_id"]     = $report_id;
@@ -158,6 +158,10 @@ class OrderLogService
         $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());
+        if($income_time){
+            $arr["income_time"]   = date("Y-m-d H:i:s", $income_time);
+        }
+
         return $arr;
     }