更新收货处理

This commit is contained in:
yaooo 2023-08-11 15:54:05 +08:00
parent 9cfc2d0757
commit 5873ed6ccd
2 changed files with 8 additions and 5 deletions

View File

@ -193,6 +193,7 @@ class StoreOrderRepository extends BaseRepository
public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = []) public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [])
{ {
$groupOrder->append(['user']); $groupOrder->append(['user']);
Log::info("=============1");
//修改订单状态 //修改订单状态
Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) { Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) {
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
@ -442,13 +443,14 @@ class StoreOrderRepository extends BaseRepository
} catch (Exception $e) { } catch (Exception $e) {
} }
} }
Log::info("=============2");
Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_PAY_SUCCESS', 'id' => $groupOrder->group_order_id]); Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_PAY_SUCCESS', 'id' => $groupOrder->group_order_id]);
Queue::push(SendSmsJob::class, ['tempId' => 'ADMIN_PAY_SUCCESS_CODE', 'id' => $groupOrder->group_order_id]); Queue::push(SendSmsJob::class, ['tempId' => 'ADMIN_PAY_SUCCESS_CODE', 'id' => $groupOrder->group_order_id]);
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_money', 'inc' => $groupOrder->pay_price]); Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_money', 'inc' => $groupOrder->pay_price]);
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]); Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id); app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id);
event('order.paySuccess', compact('groupOrder')); event('order.paySuccess', compact('groupOrder'));
Log::info("=============3");
//店内扫码支付 //店内扫码支付
if (isset($groupOrder['micro_pay']) && $groupOrder['micro_pay'] == 1) { if (isset($groupOrder['micro_pay']) && $groupOrder['micro_pay'] == 1) {
$order = $this->dao->search(['uid' => $groupOrder->uid])->where('group_order_id', $groupOrder->group_order_id)->find(); $order = $this->dao->search(['uid' => $groupOrder->uid])->where('group_order_id', $groupOrder->group_order_id)->find();
@ -462,7 +464,7 @@ class StoreOrderRepository extends BaseRepository
}); });
event('order.take', compact('order')); event('order.take', compact('order'));
} }
Log::info("=============4");
} }
/** /**

View File

@ -9,7 +9,7 @@ use app\common\model\system\merchant\Merchant;
use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreOrderRepository;
use app\common\repositories\system\merchant\FinancialRecordRepository; use app\common\repositories\system\merchant\FinancialRecordRepository;
use app\common\repositories\system\merchant\MerchantRepository; use app\common\repositories\system\merchant\MerchantRepository;
use app\common\model\user\User; use app\common\model\store\order\StoreOrder;
use crmeb\services\SmsService; use crmeb\services\SmsService;
use crmeb\utils\DingTalk; use crmeb\utils\DingTalk;
use think\facade\Db; use think\facade\Db;
@ -28,6 +28,7 @@ class paySuccessOrder
public function handle($event) public function handle($event)
{ {
Log::info("============= handle监听");
$this->event = $event; $this->event = $event;
$this->finance = []; $this->finance = [];
$this->index = 1; $this->index = 1;
@ -152,8 +153,8 @@ class paySuccessOrder
'logistics_code' => $code 'logistics_code' => $code
]); ]);
if ($res) { if ($res) {
//发生短信 //收货人短信
$phone = User::where('uid', $uid)->value('phone'); $phone = StoreOrder::where('order_id', $orderId)->value('user_phone');
if ($phone) { if ($phone) {
Log::info("发送短信 {$phone}, orderId: {$orderId}"); Log::info("发送短信 {$phone}, orderId: {$orderId}");
SmsService::create()->send($phone, 'TAKEGOOD_CODE', ['number' => substr($orderSn, -6), 'number2' => $code, 'phone' => $logisticsPhone]); SmsService::create()->send($phone, 'TAKEGOOD_CODE', ['number' => substr($orderSn, -6), 'number2' => $code, 'phone' => $logisticsPhone]);