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

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
From-wh 2023-05-17 16:14:09 +08:00
commit d95f17772e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crmeb/app/services/order/StoreOrderDeliveryServices.php
View File

@ -441,7 +441,6 @@ class StoreOrderDeliveryServices extends BaseServices
$orderInfoServices = app()->make(StoreOrderCartInfoServices::class);
$storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id);
// 发货信息录入
event('OrderShipping', [$orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
$res = [];
switch ($type) {
case 1://快递发货
@ -458,6 +457,13 @@ class StoreOrderDeliveryServices extends BaseServices
default:
throw new AdminException(400522);
}
if (!$data['delivery_id'] && !empty($res['kuaidinum'])) {
$data['delivery_id'] = $res['kuaidinum'];
}
if (!$data['delivery_id']) {
$data['delivery_id'] = uniqid();
}
event('OrderShipping', [$orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
//到期自动收货
event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
return $res;

2
crmeb/app/services/system/config/SystemStorageServices.php
View File

@ -217,7 +217,7 @@ class SystemStorageServices extends BaseServices
$make->update('tengxun_appid', ['value' => json_encode($appid)], 'menu_name');
break;
}
\crmeb\services\CacheService::clear();
$make->cacheDriver()->clear();
}
}