【类 型】:fix 获取订单列表连退款但是已发货得一起拿
【原 因】:哪怕是退完款得订单也要处理已发货状态 改为已送达 或者回滚 【过 程】: 【影 响】:
This commit is contained in:
parent
9a0e92acb5
commit
a300b16018
@ -710,7 +710,7 @@ class AdminController extends PublicController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @description: 获取订单列表(只拿已付款) 链表查询还有关联的站点列表的 bind_route runing字段一并取出
|
* @description: 获取订单列表(只拿已付款 和已退款但是发货状态为 已发货 订单列表) 链表查询还有关联的站点列表的 bind_route runing字段一并取出
|
||||||
*/
|
*/
|
||||||
public function getPaidOrderList()
|
public function getPaidOrderList()
|
||||||
{
|
{
|
||||||
@ -719,7 +719,15 @@ class AdminController extends PublicController
|
|||||||
}
|
}
|
||||||
|
|
||||||
$orderDb = D('order');
|
$orderDb = D('order');
|
||||||
$where['o.main_status'] = '已付款';
|
// 构建查询条件
|
||||||
|
$where['_complex'] = array(
|
||||||
|
'_logic' => 'or',
|
||||||
|
array('o.main_status' => '已付款'),
|
||||||
|
array(
|
||||||
|
'o.main_status' => '已退款',
|
||||||
|
'o.shipment_status' => '已发货'
|
||||||
|
)
|
||||||
|
);
|
||||||
$paidOrderList = $orderDb
|
$paidOrderList = $orderDb
|
||||||
->alias('o') // 别名为 o
|
->alias('o') // 别名为 o
|
||||||
->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表
|
->join('lr_receive_site rs ON o.receive_site_id = rs.id') // 关联 lr_receive_site 表
|
||||||
|
Loading…
Reference in New Issue
Block a user