Procházet zdrojové kódy

修复类型错误报错TypeError

萤火科技 před 3 roky
rodič
revize
08d4d5103d

+ 2 - 3
app/api/controller/Checkout.php

@@ -28,8 +28,7 @@ use think\response\Json;
 class Checkout extends Controller
 {
     // 结算台验证器
-    /* @var CheckoutValidate $validate */
-    private $validate;
+    private ?CheckoutValidate $validate = null;
 
     /**
      * 结算台订单信息
@@ -175,7 +174,7 @@ class Checkout extends Controller
      */
     private function getValidate(): CheckoutValidate
     {
-        if (!$this->validate) {
+        if (is_null($this->validate)) {
             $this->validate = new CheckoutValidate;
         }
         return $this->validate;

+ 1 - 1
app/api/service/order/Checkout.php

@@ -51,7 +51,7 @@ class Checkout extends BaseService
     private $user;
 
     // 订单结算商品列表
-    private $goodsList = [];
+    private $goodsList;
 
     /**
      * 订单结算api参数

+ 3 - 3
app/api/service/order/source/checkout/Basics.php

@@ -26,15 +26,15 @@ abstract class Basics extends BaseService
     protected $user;
 
     // 订单结算商品列表
-    protected $goodsList = [];
+    protected iterable $goodsList = [];
 
     /**
      * 构造方法
      * Checkout constructor.
      * @param UserModel $user
-     * @param array $goodsList
+     * @param iterable $goodsList
      */
-    public function __construct($user, $goodsList)
+    public function __construct($user, iterable $goodsList)
     {
         parent::__construct();
         $this->user = $user;

+ 9 - 4
app/common/service/delivery/Express.php

@@ -26,12 +26,17 @@ use app\common\service\BaseService;
  */
 class Express extends BaseService
 {
-    private $cityId;     // 用户收货城市id
-    private $goodsList;  // 订单商品列表
-    private $notInRuleGoodsId;  // 不在配送范围的商品ID
+    // 用户收货城市id
+    private int $cityId;
+
+    // 订单商品列表
+    private iterable $goodsList;
+
+    // 不在配送范围的商品ID
+    private ?int $notInRuleGoodsId = null;
 
     // 运费模板数据集
-    private $data = [];
+    private array $data = [];
 
     /**
      * 构造方法