From 9b63ffbdca6d9df6f6377da3d43c2753042bc2c1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 18 Dec 2023 10:32:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8B=E6=89=AB=E7=A0=81=E7=9A=84=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php | 6 +++++-
 webht/third_party/pay/models/Alipay_note_model.php       | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index d2df86b7..c31eccc4 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -524,6 +524,10 @@ class AlipayTradeService extends CI_Controller
                 $opi_firstname = 'contact@arachina.com';
             }
             //没有外联信息表示订单未分配
+            if (empty($opi_email) && !empty($opi_firstname)) {
+                $this->Alipay_note_model->update_send($item->ALI_dealId, 'send');
+                continue;
+            }
             if (empty($opi_email) || empty($opi_firstname)) {
                 $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
                 continue;
@@ -1053,7 +1057,7 @@ class AlipayTradeService extends CI_Controller
             // if (true) { // debug: 0
             if (empty($data['notelist'])) {
                 $query_pay = $this->query_pay($data["keywords"]);
-                if (empty($query_pay)) {
+                if (empty($query_pay) || $query_pay->code === '40004') {
                     $this->set_merchant('trippest');
                     $query_pay = $this->query_pay($data["keywords"]);
                 }
diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php
index 6cbd3b2b..b5c78088 100644
--- a/webht/third_party/pay/models/Alipay_note_model.php
+++ b/webht/third_party/pay/models/Alipay_note_model.php
@@ -42,7 +42,7 @@ class Alipay_note_model extends CI_Model {
 
     public function search_date($date) {
         $this->init();
-        $search_sql = " AND pn.ALI_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
+        $search_sql = " AND pn.ALI_acquiringTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
             OR isnull(ALI_sent,'') in ('sendfail','unsend','') ";
         $this->search = $search_sql;
         $this->orderby=" ORDER BY CASE pn.ALI_sent WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.ALI_sn DESC ";
@@ -127,7 +127,7 @@ class Alipay_note_model extends CI_Model {
             ));
         $insertid = $this->INFO->last_id('AlipayLog');
         $ret = "SELECT TOP 1 * FROM AlipayLog WHERE ALI_dealId='$ALI_dealId' ORDER BY ALI_sn DESC ";
-        return $this->INFO->query($ret)->row();
+        return $this->set_fundsource( $this->INFO->query($ret)->row());
     }
 
     public function get_list() {
@@ -161,6 +161,7 @@ class Alipay_note_model extends CI_Model {
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();
+                $this->set_fundsource($row);
                 return $row;
             } else {
                 return FALSE;