From d339e47cba83c80c677d17ed00eabf5afe06ef83 Mon Sep 17 00:00:00 2001
From: 何书鹏 <heshupeng@bronet.cn>
Date: Wed, 16 Feb 2022 20:27:45 +0800
Subject: [PATCH] 测试队列
---
application/api/controller/Order.php | 6 +++---
application/api/job/OrderAutoOper.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index eddbff6..f474887 100644
--- a/application/api/controller/Order.php
+++ b/application/api/controller/Order.php
@@ -658,7 +658,7 @@ class Order extends Api
$order = $model->where('id',$order_id)->find();
empty($order) && $this->error('订单不存在');
- $res = $this->cancelOrderAction($order);
+ $res = self::cancelOrderAction($order);
$res['code'] == 0 && $this->error($res['msg']);
$this->success('取消成功');
@@ -668,7 +668,7 @@ class Order extends Api
* 取消订单操作
* @ApiInternal
*/
- public function cancelOrderAction($order)
+ public static function cancelOrderAction($order)
{
\think\Log::write('订单数据：'.json_encode($order));
if($order['freight_status'] == '20'){
@@ -691,7 +691,7 @@ class Order extends Api
if($order['pay_status'] == '20'){
$config = Service::getConfig('wechat');
$config['app_id'] = $config['miniapp_id'];
- $config['notify_url'] = $this->request->domain().'api/notify/refund/type/wechat';
+ $config['notify_url'] = request()->domain().'api/notify/refund/type/wechat';
$config['return_url'] = '';
$wechat = Pay::wechat($config);
$refund_no = 'LQ-'.time().mt_rand(10000,99999);
diff --git a/application/api/job/OrderAutoOper.php b/application/api/job/OrderAutoOper.php
index 62920b0..dff9eaa 100644
--- a/application/api/job/OrderAutoOper.php
+++ b/application/api/job/OrderAutoOper.php
@@ -19,7 +19,7 @@ class OrderAutoOper extends BaseJob
$order = \app\api\model\Order::get($order_id);
if ($order && $order['pay_status'] == '10' && $order['order_status'] == '10') {
\think\Db::transaction(function () use ($order) {
- (new \app\api\controller\Order)->cancelOrderAction($order);
+ \app\api\controller\Order::cancelOrderAction($order);
});
}
--
libgit2 0.24.0