mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新退货判断

Browse Source
This commit is contained in:
yaooo 2023-08-28 19:06:24 +08:00
parent f97af3626c
commit 8c55a4e04d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -1715,7 +1715,7 @@ class StoreOrderRepository extends BaseRepository
} else { } else {
$query = $this->dao->search($where)->where($this->getOrderType($status))->where('StoreOrder.is_del', 0); $query = $this->dao->search($where)->where($this->getOrderType($status))->where('StoreOrder.is_del', 0);
} }
$count = $query->count(); $count = $query->count();
$list = $query->with([ $list = $query->with([
'orderProduct', 'orderProduct',

4
app/controller/api/store/order/StoreRefundOrder.php
View File

@ -130,7 +130,9 @@ class StoreRefundOrder extends BaseController
if (!$order->refund_status) if (!$order->refund_status)
return app('json')->fail('订单已过退款/退货期限'); return app('json')->fail('订单已过退款/退货期限');
if ($order->status < 0) return app('json')->fail('订单已退款'); if ($order->status < 0) return app('json')->fail('订单已退款');
if ($order->status == 1) return app('json')->fail('订单已发货不支持退款'); if ($order->activity_type == 0) {
if ($order->status == 1) return app('json')->fail('订单已发货不支持退款');
}
if ($order->status == 10) return app('json')->fail('订单不支持退款'); if ($order->status == 10) return app('json')->fail('订单不支持退款');
if($order->is_virtual && $data['refund_type'] == 2) return app('json')->fail('订单不支持退款退货'); if($order->is_virtual && $data['refund_type'] == 2) return app('json')->fail('订单不支持退款退货');
if ($type == 1) { if ($type == 1) {