xinyin025/mpay
1
0
Fork 0
mirror of https://gitee.com/technical-laohu/mpay.git synced 2025-11-13 22:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1. 订单列表添加平台流水号查询

Browse Source 
2. 修临订单查询功能异常问题
3. 优化订单数据表结构
This commit is contained in:
技术老胡
2025-03-31 12:21:00 +08:00
parent 2cd473019b
commit a3d15ee7e2
3 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controller/InstallController.php
View File

@@ -240,6 +240,7 @@ EOT;
`create_time` datetime DEFAULT CURRENT_TIMESTAMP,
`close_time` datetime DEFAULT NULL,
`pay_time` datetime DEFAULT NULL,
`platform` varchar(15) NOT NULL DEFAULT '',
`platform_order` varchar(255) NOT NULL DEFAULT '',
`aid` int(11) NOT NULL DEFAULT 0,
`cid` int(11) NOT NULL DEFAULT 0,

25
app/model/Order.php
View File

@@ -70,41 +70,32 @@ class Order extends BaseModel
public static function serchOrders($query)
{
$select = [];
$_select = [];
$allow_field = ['id', 'order_id', 'pid', 'type', 'out_trade_no', 'notify_url', 'return_url', 'name', 'really_price', 'money', 'clientip', 'device', 'state', 'create_time_start', 'create_time_end', 'close_time', 'pay_time', 'platform', 'platform_order', 'aid', 'cid',];
$allow_field = ['id', 'order_id', 'pid', 'type', 'out_trade_no', 'name', 'really_price', 'money', 'state', 'create_time_start', 'create_time_end', 'close_time', 'pay_time', 'platform', 'platform_order', 'aid', 'cid',];
foreach ($query as $key => $value) {
if (in_array($key, $allow_field) && isset($value)) {
if ($key === 'name') {
$select[] = ['Order.' . $key, 'like', '%' . $value . '%'];
$select[] = [$key, 'like', '%' . $value . '%'];
continue;
}
if ($key === 'create_time_start') {
$select[] = ['Order.' . 'create_time', '>', $value];
$select[] = ['create_time', '>', $value];
continue;
}
if ($key === 'create_time_end') {
$select[] = ['Order.' . 'create_time', '<', $value];
$select[] = ['create_time', '<', $value];
continue;
}
if ($key === 'platform') {
$_select['platform'] = $value;
continue;
}
$select[] = ['Order.' . $key, '=', $value];
$select[] = [$key, '=', $value];
}
}
return self::with('payAccount')
->hasWhere('payAccount', function ($query) use ($_select) {
$query->where($_select);
})
->where($select);
return self::where($select);
}
// 查询订单详细
public static function showOrderDetail($id)
{
$order = self::find($id);
$a_list = PayAccount::find($order->aid);
$c_list = PayChannel::find($order->cid);
$a_list = PayAccount::withTrashed()->find($order->aid);
$c_list = PayChannel::withTrashed()->find($order->cid);
if (!$order) {
return [];
}