github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.7.0dev' into v5.0.0dev

Browse Source 
# Conflicts:
#	template/uni-app/pages/goods_cate/goods_cate.vue
This commit is contained in:
evoxwht 2023-04-14 14:38:33 +08:00
commit e86f59590a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crmeb/app/services/order/StoreOrderServices.php
View File

@ -771,6 +771,15 @@ HTML;
/** @var StoreOrderCreateServices $createServices */
$createServices = app()->make(StoreOrderCreateServices::class);
$data['order_id'] = $createServices->getNewOrderId('cp');
if (sys_config('user_brokerage_type') == 1) {
$percent = bcdiv((string)$data['pay_price'], (string)$order['pay_price'], 6);
if ($order['one_brokerage'] > 0) {
$data['one_brokerage'] = bcmul((string)$order['one_brokerage'], $percent, 2);
}
if ($order['two_brokerage'] > 0) {
$data['two_brokerage'] = bcmul((string)$order['two_brokerage'], $percent, 2);
}
}
/** @var StoreOrderStatusServices $services */
$services = app()->make(StoreOrderStatusServices::class);
return $this->transaction(function () use ($id, $data, $services) {
@ -2549,7 +2558,7 @@ HTML;
'is_del' => 0,
'paid' => 1,
'status' => 2,
'change_type' => ['take_delivery','user_take_delivery']
'change_type' => ['take_delivery', 'user_take_delivery']
], 30);
foreach ($orderList as $item) {
AutoCommentJob::dispatch([$item['id'], $item['cart_id']]);