|
|
@@ -109,12 +109,27 @@ class PaymentRecordService
|
|
|
if ($wechatPayment->express_company == null) {
|
|
|
$delivery = WechatDeliveryEntity::where(['delivery_name' => $order['express_name']])->findOrEmpty();
|
|
|
if ($delivery->isEmpty()) {
|
|
|
- Log::warning('未找到物流公司{transaction_id}', ['transaction_id' => $wechatPayment->wechat_transaction_id]);
|
|
|
- return;
|
|
|
+ // 未找到从历史记录查找
|
|
|
+ $wechatPayment->express_company_name = $order['express_name'];
|
|
|
+ $successPayment = LakalaWechatPaymentModel::where('express_company_name', $order['express_name'])
|
|
|
+ ->whereNotNull('express_company')
|
|
|
+ ->findOrEmpty();
|
|
|
+ if (!$successPayment->isEmpty()) {
|
|
|
+ $wechatPayment->express_company = $successPayment->express_company;
|
|
|
+ }
|
|
|
+ $wechatPayment->save();
|
|
|
+ if ($successPayment->isEmpty()) {
|
|
|
+ Log::warning('未找到物流公司 {transaction_id} {express_company_name}', [
|
|
|
+ 'transaction_id' => $wechatPayment->wechat_transaction_id,
|
|
|
+ 'express_company_name' => $order['express_name'],
|
|
|
+ ]);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $wechatPayment->express_company = $delivery['delivery_id'];
|
|
|
+ $wechatPayment->express_company_name = $delivery['delivery_name'];
|
|
|
+ $wechatPayment->save();
|
|
|
}
|
|
|
- $wechatPayment->express_company = $delivery['delivery_id'];
|
|
|
- $wechatPayment->express_company_name = $delivery['delivery_name'];
|
|
|
- $wechatPayment->save();
|
|
|
}
|
|
|
try {
|
|
|
$this->expressService->uploadShippingInfo(
|