细节优化

app/api/model/Order.php

@@ -56,7 +56,7 @@ class Order extends OrderModel
      */
     public static function getPayDetail(string $orderNo)
     {
-        return self::detail(['order_no' => $orderNo, 'pay_status' => 10, 'is_delete' => 0], ['goods', 'user']);
+        return self::detail(['order_no' => $orderNo, 'pay_status' => PayStatusEnum::PENDING, 'is_delete' => 0], ['goods', 'user']);
     }
 
     /**
@@ -82,7 +82,7 @@ class Order extends OrderModel
     /**
      * 构建支付请求的参数
      * @param self $order 订单信息
-     * @param string $payType 订单支付方式
+     * @param int $payType 订单支付方式
      * @return array
      * @throws BaseException
      * @throws \think\db\exception\DataNotFoundException
@@ -254,7 +254,7 @@ class Order extends OrderModel
                 'order_status' => 30
             ]);
             // 执行订单完成后的操作
-            $OrderCompleteService = new OrderCompleteService(OrderTypeEnum::ORDER);
+            $OrderCompleteService = new OrderCompleteService();
             $OrderCompleteService->complete([$this], static::$storeId);
             return $status;
         });

app/api/service/order/PaySuccess.php

@@ -12,15 +12,16 @@ declare (strict_types=1);
 
 namespace app\api\service\order;
 
+use think\facade\Event;
 use app\common\service\BaseService;
 use app\api\model\User as UserModel;
 use app\api\model\Order as OrderModel;
 use app\api\model\user\BalanceLog as BalanceLogModel;
 use app\common\service\goods\source\Factory as StockFactory;
 use app\common\enum\OrderType as OrderTypeEnum;
+use app\common\enum\order\PayStatus as PayStatusEnum;
 use app\common\enum\order\PayType as OrderPayTypeEnum;
 use app\common\enum\user\balanceLog\Scene as SceneEnum;
-use think\facade\Event;
 
 /**
  * 订单支付成功服务类
@@ -120,7 +121,7 @@ class PaySuccess extends BaseService
         // 整理订单信息
         $order = [
             'pay_type' => $payType,
-            'pay_status' => 20,
+            'pay_status' => PayStatusEnum::SUCCESS,
             'pay_time' => time()
         ];
         if ($payType == OrderPayTypeEnum::WECHAT) {

app/common/library/wechat/WxPay.php

@@ -28,8 +28,8 @@ class WxPay extends WxBase
 
     // 订单模型
     private $modelClass = [
-        OrderTypeEnum::ORDER => 'app\api\service\order\PaySuccess',
-        OrderTypeEnum::RECHARGE => 'app\api\service\recharge\PaySuccess',
+        OrderTypeEnum::ORDER => \app\api\service\order\PaySuccess::class,
+        OrderTypeEnum::RECHARGE => \app\api\service\recharge\PaySuccess::class,
     ];
 
     /**