【类 型】:test

【主	题】:
【描	述】:
	[原因]:
	[过程]:
	[影响]:
【结	束】

# 类型 包含:
# feat:新功能(feature)
# fix:修补bug
# docs:文档(documentation)
# style: 格式(不影响代码运行的变动)
# refactor:重构(即不是新增功能,也不是修改bug的代码变动)
# test:增加测试
# chore:构建过程或辅助工具的变动
This commit is contained in:
tk 2024-07-05 14:55:19 +08:00
parent 159a3783f0
commit 070a83a35d

View File

@ -743,11 +743,12 @@ class AdminController extends PublicController
*/
public function getOrderList()
{
$where = [];
//总管理员 可接收任何shop_id 非总管理员 只可以调用自身shop_id 否则会中断
$this->isPower();
// 非总管理员只返回自己的账户信息
if ($this->tokenShop_id != C('powerId')) {
$where['shop_id'] = $this->tokenShop_id;
// 添加 shop_id 条件
if ($_REQUEST['shop_id'] != '') {
$where['shop_id'] = $_REQUEST['shop_id'];
}
// 添加 start_time 和 end_time 条件
@ -755,38 +756,38 @@ class AdminController extends PublicController
$where['order_time'] = array('between', array($_REQUEST['start_time'], $_REQUEST['end_time']));
}
// 添加 main_status 条件
if (isset($_REQUEST['main_status']) && is_array($_REQUEST['main_status'])) {
$where['main_status'] = array('in', $_REQUEST['main_status']);
}
// // 添加 main_status 条件
// if (isset($_REQUEST['main_status']) && is_array($_REQUEST['main_status'])) {
// $where['main_status'] = array('in', $_REQUEST['main_status']);
// }
// 添加 shipment_status 条件
if (isset($_REQUEST['shipment_status']) && is_array($_REQUEST['shipment_status'])) {
$where['shipment_status'] = array('in', $_REQUEST['shipment_status']);
}
// // 添加 shipment_status 条件
// if (isset($_REQUEST['shipment_status']) && is_array($_REQUEST['shipment_status'])) {
// $where['shipment_status'] = array('in', $_REQUEST['shipment_status']);
// }
// 添加 refund_status 条件
if (isset($_REQUEST['refund_status']) && is_array($_REQUEST['refund_status'])) {
$where['refund_status'] = array('in', $_REQUEST['refund_status']);
}
// // 添加 refund_status 条件
// if (isset($_REQUEST['refund_status']) && is_array($_REQUEST['refund_status'])) {
// $where['refund_status'] = array('in', $_REQUEST['refund_status']);
// }
// 添加搜索条件
if (isset($_REQUEST['search']) && is_array($_REQUEST['search']) && count($_REQUEST['search']) == 2) {
list($field, $value) = $_REQUEST['search'];
if (!empty($field) && !empty($value)) {
$fieldMap = [
'orderSn' => 'order_sn',
'name' => 'receiver',
'tel' => 'tel',
'remark' => 'remark',
'desc' => 'describe'
];
// // 添加搜索条件
// if (isset($_REQUEST['search']) && is_array($_REQUEST['search']) && count($_REQUEST['search']) == 2) {
// list($field, $value) = $_REQUEST['search'];
// if (!empty($field) && !empty($value)) {
// $fieldMap = [
// 'orderSn' => 'order_sn',
// 'name' => 'receiver',
// 'tel' => 'tel',
// 'remark' => 'remark',
// 'desc' => 'describe'
// ];
if (array_key_exists($field, $fieldMap)) {
$where[$fieldMap[$field]] = array('like', '%' . $value . '%');
}
}
}
// if (array_key_exists($field, $fieldMap)) {
// $where[$fieldMap[$field]] = array('like', '%' . $value . '%');
// }
// }
// }
$orderDb = D('order');
$orderList = $orderDb->where($where)->select();