...
|
...
|
@@ -58,7 +58,15 @@ class OrderExpress extends Model |
|
|
$express_no = $params['express_no'] ?? '';
|
|
|
$order_id = $params['order_id'] ?? 0;
|
|
|
|
|
|
$detail = self::with('log')->where('user_id', $user->id)->where('order_id', $order_id)->where('express_no', $express_no)->find();
|
|
|
$detail = self::with(['log','order'])->where('user_id', $user->id)->where('order_id', $order_id)->where('express_no', $express_no)->find();
|
|
|
|
|
|
// 差异更新物流信息
|
|
|
$expressLib = new \addons\shopro\library\Express();
|
|
|
$result = $expressLib->search([
|
|
|
'express_code' => $detail['express_code'],
|
|
|
'express_no' => $detail['express_no']
|
|
|
], $detail, $detail->order);
|
|
|
$expressLib->checkAndAddTraces($detail, $result);
|
|
|
|
|
|
return $detail;
|
|
|
}
|
...
|
...
|
|