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-14 16:26:07 +08:00
commit 3085997737
2 changed files with 2 additions and 1 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

@ -732,7 +732,7 @@ class StoreOrderRepository extends BaseRepository
app()->make(MerchantRepository::class)->computedLockMoney($order); app()->make(MerchantRepository::class)->computedLockMoney($order);
} }
if (!empty($order->interest) && $order->interest->status == StoreOrderInterest::STATUS_UNSETTLED) { if (!empty($order->interest) && $order->interest->status == StoreOrderInterest::STATUS_UNSETTLED) {
$order->interest->start_time = date('Y-m-d H:i:s', strtotime("+{$order['merchant']['settle_cycle']} days")); $order->interest->start_time = date('Y-m-d H:i:s', strtotime("+{$order->interest->settle_cycle} days"));
$order->interest->save(); $order->interest->save();
} }
$order->save(); $order->save();

1
app/listener/OrderCreate.php
View File

@ -31,6 +31,7 @@ class OrderCreate
'to_mer_id' => $order['mer_id'] ?? 0, 'to_mer_id' => $order['mer_id'] ?? 0,
'total_price' => $groupOrder['total_price'], 'total_price' => $groupOrder['total_price'],
'rate' => $order['merchant']['interest_rate'] ?? 0, 'rate' => $order['merchant']['interest_rate'] ?? 0,
'settle_cycle' => $order['merchant']['settle_cycle'] ?? 0,
]; ];
return $storeOrderInterestRepository->create($data); return $storeOrderInterestRepository->create($data);
} }