Merge branch 'dev'
This commit is contained in:
commit
ab58fb9326
@ -99,7 +99,7 @@ class CancelUnpayOrdersDelayDirectConsumer extends ConsumerMessage
|
||||
|
||||
// 关闭支付订单
|
||||
try {
|
||||
$WechatPay = new WechatPay("1", 1);
|
||||
$WechatPay = new WechatPay("1", $data['order_type']);
|
||||
|
||||
// 关闭订单
|
||||
$WechatPay->closeOrder($data['order_no']);
|
||||
@ -107,8 +107,6 @@ class CancelUnpayOrdersDelayDirectConsumer extends ConsumerMessage
|
||||
Log::getInstance("queue-CancelUnpayOrders")->error($e->getMessage());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Db::commit();
|
||||
Log::getInstance("queue-CancelUnpayOrders")->info("成功");
|
||||
return Result::ACK;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user