|
@@ -15,6 +15,7 @@ use support\Db;
|
|
|
use support\exception\BusinessException;
|
|
|
use support\Log as SupportLog;
|
|
|
use support\Redis;
|
|
|
+use Webman\Event\Event;
|
|
|
use Yansongda\Pay\Exceptions\GatewayException;
|
|
|
use Yansongda\Pay\Log;
|
|
|
use Yansongda\Pay\Pay;
|
|
@@ -47,6 +48,9 @@ class OrderService
|
|
|
// 订单详情表
|
|
|
OrderSheet::where('join_sheet_order_id', $order->order_id)->update(['order_sheet_status' => 'DONE']);
|
|
|
|
|
|
+ // 会员升级
|
|
|
+ Event::dispatch('order_pay.member_level.up', $order->join_order_member_id);
|
|
|
+
|
|
|
// 7天后自动完成 order_is_complete=Y
|
|
|
// $redis = Redis::connection();
|
|
|
// $key = Order::AUTOMATIC_COMPLETE_PREFIX . date('Ymd', strtotime("+7 days"));
|
|
@@ -76,13 +80,16 @@ class OrderService
|
|
|
|
|
|
foreach ($orderIds as $orderId) {
|
|
|
$order = Order::where('order_id', $orderId)
|
|
|
- ->select('order_is_complete', 'order_category', 'order_status_system')
|
|
|
+ ->select('order_is_complete', 'order_category', 'order_status_system', 'join_order_member_id')
|
|
|
->first();
|
|
|
if ($order && $order->order_is_complete != 'Y' && $order->order_category != 'RETURN' && in_array($order->order_status_system, ['RECVING', 'SIGNED', 'CONFIRM'])) {
|
|
|
// 更新主表
|
|
|
Order::where('order_id', $orderId)->update(['order_is_complete' => 'Y', 'order_status_system' => 'CONFIRM', 'order_status_storage' => 'DONE']);
|
|
|
// sheet表
|
|
|
OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
|
|
|
+
|
|
|
+ // 会员升级
|
|
|
+ Event::dispatch('order_pay.member_level.up', $order->join_order_member_id);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -376,7 +383,7 @@ class OrderService
|
|
|
'pay_prepayid' => $params['pay_category'],
|
|
|
'pay_json_request' => json_encode($params),
|
|
|
'pay_json_response' => $params['pay_json_response'] ?? '[]',
|
|
|
- 'join_pay_object_json' => !empty($params['orderId']) ? json_encode(['order_id'=>$params['orderId']]) : '[]',
|
|
|
+ 'join_pay_object_json' => !empty($params['orderId']) ? json_encode(['order_id' => $params['orderId']]) : '[]',
|
|
|
'pay_addtimes' => time()
|
|
|
];
|
|
|
|
|
@@ -410,7 +417,7 @@ class OrderService
|
|
|
$payDetail->pay_amount = $params['order_amount_pay'];
|
|
|
$payDetail->pay_paytimes = date('Y-m-d H:i:s');
|
|
|
$payDetail->pay_status = 'SUCCESS';
|
|
|
- $payDetail->join_pay_object_json = !empty($params['orderId']) ? json_encode(['order_id'=>$params['orderId']]) : '[]';
|
|
|
+ $payDetail->join_pay_object_json = !empty($params['orderId']) ? json_encode(['order_id' => $params['orderId']]) : '[]';
|
|
|
$payDetail->save();
|
|
|
}
|
|
|
|