gitfjn/duolamaojiazhen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复内容

Browse Source
This commit is contained in:
gitfjn
2026-01-30 18:48:13 +08:00
parent 5fe5289e26
commit 76cfa6b278
25 changed files with 943 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/admin/logic/OrderLogic.php
View File

@@ -34,10 +34,14 @@ class OrderLogic
public static function getListsCondition($get)
{
$where = [];
//订单状态
if ($get['type'] != '') {
$where[] = ['pay_status', '=', $get['type']];
if ($get['type'] != 66){
//订单状态
if ($get['type'] != '') {
$where[] = ['pay_status', '=', $get['type']];
}
$where[] = ['del', '=', 0];
}else{
$where[] = ['del', '=', 1];
}
//订单编号查询
if (isset($get['order_sn']) && $get['order_sn'] != '') {
@@ -117,7 +121,7 @@ class OrderLogic
$order = new Order();
$where = self::getListsCondition($get);
$field = 'o.*,order_status as order_status_text,pay_way as pay_way_text';
$brand = Db::name('goods_brand')->where(['del' => 0])->column('name', 'id'); //订单类型
$brand = Db::name('goods_brand')->column('name', 'id'); //订单类型
$admin = Db::name('admin')->column('name', 'id');
$count = $order
->where($where)