pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

解决冲突

release
Jing Li 2022-01-22 15:30:43 +08:00
parent f68ac5039a
commit 8758c5e9d1
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Admin/Services/OrderPackageService.php
View File

@ -52,9 +52,6 @@ class OrderPackageService
$_orderProduct->decrement('remain_quantity', $product['quantity']); $_orderProduct->decrement('remain_quantity', $product['quantity']);
} }
<<<<<<< Updated upstream
if (!$package) { if (!$package) {
//创建发货单数据 //创建发货单数据
$package = new OrderPackage(); $package = new OrderPackage();
@ -99,34 +96,6 @@ class OrderPackageService
'updated_at' => $package->created_at, 'updated_at' => $package->created_at,
]); ]);
}, $packageProducts)); }, $packageProducts));
=======
//创建发货单数据
$package = new OrderPackage();
$package->order_id = $order->id;
$package->user_id = $order->user_id;
$package->consignee_name = $order->consignee_name;
$package->consignee_telephone = $order->consignee_telephone;
$package->consignee_zone = $order->consignee_zone;
$package->consignee_address = $order->consignee_address;
$package->shipping_company = $params['shipping_company'];
$package->shipping_code = Arr::get(Kuaidi100Service::$codeArr, $package->shipping_company, '');
$package->shipping_number = $params['shipping_number'];
//保存发货单
$package->save();
//保存发货单商品
OrderPackageProduct::insert(array_map(function ($value) use ($package) {
return array_merge($value, [
'order_package_id' => $package->id,
'created_at' => $package->created_at,
'updated_at' => $package->created_at,
]);
}, $packageProducts));
if (config('settings.kuaidi100_is_use')) {
$kuaidi100Service = new Kuaidi100Service();
$kuaidi100Service->poll($package->shipping_number, $package->shipping_code, $package->consignee_telephone);
>>>>>>> Stashed changes
} }
//更新订单状态 //更新订单状态

10
app/Services/Kuaidi100Service.php
View File

@ -1403,17 +1403,11 @@ class Kuaidi100Service
$package->update([ $package->update([
'last_news'=> empty($lastNews) ? '' : $lastNews['context'], 'last_news'=> empty($lastNews) ? '' : $lastNews['context'],
]); ]);
<<<<<<< Updated upstream
try { try {
//更新包裹状态 //更新包裹状态
(new OrderPackageService())->updatePackageStatus($package, $status); (new OrderPackageService())->updatePackageStatus($package, $status);
} catch (OrderPackageAlreadyCheckedException $e) { } catch (OrderPackageAlreadyCheckedException $e) {
} }
=======
//更新包裹状态
$orderService = new OrderService();
$orderService->updatePackageStatus($package, $status);
>>>>>>> Stashed changes
} }
//记录物流信息 //记录物流信息
KuaidiLog::updateOrCreate([ KuaidiLog::updateOrCreate([
@ -1494,11 +1488,7 @@ class Kuaidi100Service
*/ */
public function unPollSign(string $sign, array $params) public function unPollSign(string $sign, array $params)
{ {
<<<<<<< Updated upstream
return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).app_settings('kuaidi100.secret'))); return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).app_settings('kuaidi100.secret')));
=======
return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).config('settings.kuaidi100_secret')));
>>>>>>> Stashed changes
} }
public function getStatusName($state = 0) public function getStatusName($state = 0)