cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!181 修改

Browse Source 
Merge pull request !181 from 赵世界/develop
This commit is contained in:
赵世界 2023-08-08 10:15:50 +00:00 committed by Gitee
commit 06bf1e01b3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Shop/ShopsController.php
View File

@ -247,7 +247,6 @@ class ShopsController extends Controller
foreach ($subCols['branch_account_cols'] as $accountCols) { foreach ($subCols['branch_account_cols'] as $accountCols) {
foreach ($accountCols['shipp_address_cols'] as $item) { foreach ($accountCols['shipp_address_cols'] as $item) {
$item['wp_code'] = $subCols['wp_code']; $item['wp_code'] = $subCols['wp_code'];
unset($item['r1_expires_at'], $item['r1_expires_in'], $item['r2_expires_at'], $item['r2_expires_in'], $item['w1_expires_at'], $item['w1_expires_in'], $item['w2_expires_at'], $item['w2_expires_in']);
ShopSender::query()->updateOrCreate( ShopSender::query()->updateOrCreate(
['shop_id' => $shopId, 'shop_ship_id' => $shopShip->id, 'detail' => $item['detail']], ['shop_id' => $shopId, 'shop_ship_id' => $shopShip->id, 'detail' => $item['detail']],
$item $item

1
app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
View File

@ -41,6 +41,7 @@ class KuaiTuanTuan extends BusinessClient
$this->shop->update($accessToken); $this->shop->update($accessToken);
} }
if ('ship' === $type) { if ('ship' === $type) {
unset($accessToken['r1_expires_at'], $accessToken['r1_expires_in'], $accessToken['r2_expires_at'], $accessToken['r2_expires_in'], $accessToken['w1_expires_at'], $accessToken['w1_expires_in'], $accessToken['w2_expires_at'], $accessToken['w2_expires_in']);
ShopShip::query()->updateOrCreate( ShopShip::query()->updateOrCreate(
['shop_id' => $this->shop->id], ['shop_id' => $this->shop->id],
$accessToken $accessToken