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

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-12 17:52:00 +08:00
commit ad9142fe89
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2453,7 +2453,8 @@ class StoreOrderRepository extends BaseRepository
if (!$groupOrder) { if (!$groupOrder) {
throw new Exception('订单不存在或已支付'); throw new Exception('订单不存在或已支付');
} }
if (!$groupOrder->interest || $groupOrder->interest->status != StoreOrderInterest::STATUS_UNSETTLED) { $order = $groupOrder->orderList[0];
if (!$groupOrder->interest || $groupOrder->interest->status != StoreOrderInterest::STATUS_UNSETTLED || $order->status != 2) {
throw new Exception('订单无需结算'); throw new Exception('订单无需结算');
} }
$interest = $groupOrder->interest->calculateInterest(); $interest = $groupOrder->interest->calculateInterest();