From 88d0e68a963d4cad6bdeca684c85be40b142351a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=AF=E4=B9=90=E5=8A=A0=E5=86=B0?=
 <11869599+addie66@user.noreply.gitee.com>
Date: Fri, 9 Oct 2026 10:41:23 +0800
Subject: [PATCH] =?UTF-8?q?```=20feat(split-order):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BA=A4=E6=98=93=E5=8D=95=E5=8F=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单模型中添加Db类引入以支持数据库查询
- 在搜索字段中添加wx_transaction_id支持
- 实现通过微信交易单号查找订单ID的功能，包括在payment_json和pay_ext表中的查询
- 添加微信交易单号输入框到前端界面
- 更新JavaScript过滤器配置以包含新的搜索字段
```
---
 .../admin/controller/shopro/split/Order.php   | 34 ++++++++++++++++++-
 .../admin/view/shopro/split/order/index.html  |  1 +
 .../assets/js/backend/shopro/split/order.js   |  3 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/shopro/split/Order.php b/application/admin/controller/shopro/split/Order.php
index 1fb3337..cb07931 100644
--- a/application/admin/controller/shopro/split/Order.php
+++ b/application/admin/controller/shopro/split/Order.php
@@ -9,6 +9,7 @@ use addons\shopro\library\split\SplitExecutor;
 use addons\shopro\library\split\ProfitSharingService;
 use app\admin\model\shopro\order\Order as ShopOrder;
 use app\admin\model\shopro\user\User as ShopUser;
+use think\Db;
 
 class Order extends Base
 {
@@ -32,7 +33,7 @@ class Order extends Base
     {
         $this->request->filter(['strip_tags']);
         if ($this->request->isAjax()) {
-            $nobuildfields = ['buyer_keyword', 'order_sn', 'status', 'channel', 'createtime'];
+            $nobuildfields = ['buyer_keyword', 'order_sn', 'wx_transaction_id', 'status', 'channel', 'createtime'];
             list($where, $sort, $order, $offset, $limit) = $this->custombuildparams(null, $nobuildfields);
 
             $query = $this->buildSearch();
@@ -71,6 +72,17 @@ class Order extends Base
             $orderIds = ShopOrder::where('order_sn', 'like', '%' . trim($filter['order_sn']) . '%')->column('id');
             $query = $query->where('order_id', 'in', $orderIds ?: [0]);
         }
+        if (!empty($filter['wx_transaction_id'])) {
+            $orderIds = $this->resolveOrderIdsByWxTransactionId($filter['wx_transaction_id']);
+            $query = $query->where(function ($q) use ($orderIds, $filter) {
+                $txn = trim($filter['wx_transaction_id']);
+                $like = '%' . $txn . '%';
+                $q->where('transaction_id', 'like', $like);
+                if ($orderIds) {
+                    $q->whereOr('order_id', 'in', $orderIds);
+                }
+            });
+        }
         if (!empty($filter['buyer_keyword'])) {
             $kw = trim($filter['buyer_keyword']);
             $userIds = ShopUser::where('nickname|mobile', 'like', '%' . $kw . '%')->column('id');
@@ -99,6 +111,26 @@ class Order extends Base
         return $query;
     }
 
+    /**
+     * 微信交易单号 → 商城 order_id（汇付单号在 payment_json / pay_ext.extra）
+     */
+    protected function resolveOrderIdsByWxTransactionId($txn)
+    {
+        $txn = trim((string) $txn);
+        if ($txn === '') {
+            return [];
+        }
+        $like = '%' . $txn . '%';
+        $ids = ShopOrder::where('transaction_id', 'like', $like)->column('id');
+        $ids = array_merge($ids, ShopOrder::where('payment_json', 'like', $like)->column('id'));
+        try {
+            $ids = array_merge($ids, Db::name('shopro_huifu_pay_ext')->where('extra', 'like', $like)->column('order_id'));
+        } catch (\Exception $e) {
+            // table may not exist
+        }
+        return array_values(array_unique(array_filter(array_map('intval', $ids))));
+    }
+
     protected function formatSplitOrderList($list)
     {
         $rows = [];
diff --git a/application/admin/view/shopro/split/order/index.html b/application/admin/view/shopro/split/order/index.html
index 9cca58c..72eae3a 100644
--- a/application/admin/view/shopro/split/order/index.html
+++ b/application/admin/view/shopro/split/order/index.html
@@ -199,6 +199,7 @@
         <div class="toolbar-row">
             <el-input v-model="filters.buyer_keyword" placeholder="买家昵称/手机号" size="small" style="width:160px;" clearable></el-input>
             <el-input v-model="filters.order_sn" placeholder="订单号" size="small" style="width:170px;" clearable></el-input>
+            <el-input v-model="filters.wx_transaction_id" placeholder="微信交易单号" size="small" style="width:200px;" clearable></el-input>
             <el-select v-model="filters.status" placeholder="分账状态" size="small" style="width:120px;" clearable>
                 <el-option label="待分账" value="0"></el-option>
                 <el-option label="分账中" value="1"></el-option>
diff --git a/public/assets/js/backend/shopro/split/order.js b/public/assets/js/backend/shopro/split/order.js
index 2a7355b..fdc8c79 100644
--- a/public/assets/js/backend/shopro/split/order.js
+++ b/public/assets/js/backend/shopro/split/order.js
@@ -14,6 +14,7 @@ define(['jquery', 'bootstrap', 'backend', 'form'], function ($, undefined, Backe
                         filters: {
                             buyer_keyword: '',
                             order_sn: '',
+                            wx_transaction_id: '',
                             status: '',
                             channel: ''
                         },
@@ -36,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'form'], function ($, undefined, Backe
                         this.getList();
                     },
                     resetFilters() {
-                        this.filters = { buyer_keyword: '', order_sn: '', status: '', channel: '' };
+                        this.filters = { buyer_keyword: '', order_sn: '', wx_transaction_id: '', status: '', channel: '' };
                         this.dateRange = [];
                         this.currentPage = 1;
                         this.getList();