dlh/dlh_test_server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xucong 2024-08-10 15:12:08 +08:00
commit eeca2b90e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/logic/AfterSaleLogic.php
View File

@ -53,7 +53,7 @@ class AfterSaleLogic extends Logic
switch ($type) { switch ($type) {
case 'normal': case 'normal':
$where[] = ['g.refund_status', '=', OrderGoodsEnum::REFUND_STATUS_NO]; $where[] = ['g.refund_status', '=', OrderGoodsEnum::REFUND_STATUS_NO];
$where[] = ['o.order_status', 'in', [Order::STATUS_WAIT_DELIVERY, Order::STATUS_WAIT_RECEIVE, Order::STATUS_FINISH]]; $where[] = ['o.order_status', 'in', [Order::STATUS_WAIT_RECEIVE, Order::STATUS_FINISH]];
$order = new Order(); $order = new Order();
$count = $order->alias('o') $count = $order->alias('o')
->field('o.id,o.confirm_take_time,o.order_status,o.create_time, o.allow_after_sale, s.id as sid,s.name as shop_name,s.type as shop_type') ->field('o.id,o.confirm_take_time,o.order_status,o.create_time, o.allow_after_sale, s.id as sid,s.name as shop_name,s.type as shop_type')