wesmiler

app/Services/Api/OrderService.php

@@ -232,9 +232,8 @@ class OrderService extends BaseService
             }
         }
         unset($item);
-var_dump($goods);
         if($orderXdTotal<=0 || $goodsNum<=0){
-            $this->error ='2904';
+            $this->error = 2904;
             return false;
         }
 
@@ -244,21 +243,6 @@ var_dump($goods);
 
         }
 
-        // 运费
-        $skus = array_values($skuList);
-        if(!$freightData = GoodsService::make()->getFreight($userId, $freightAddressId, $skus)){
-            $this->error ='2905';
-            return false;
-        }
-
-        $freight = isset($freightData['freight'])? floatval($freightData['freight']) : 0;
-        $payTotal = moneyFormat($orderXdTotal+$freight,2);
-        var_dump($payTotal, $amount);
-        if($amount != $payTotal){
-            $this->error ='2906';
-            return false;
-        }
-
         // 验证用户
         $userInfo = MemberModel::with(['parent'])->where(['id'=> $userId,'mark'=> 1,'status'=> 1])
             ->select(['id','nickname','pay_password','balance','usdt','power_num','wait_score','parent_id','parents'])
@@ -287,6 +271,21 @@ var_dump($goods);
             return false;
         }
 
+        // 运费
+        $skus = array_values($skuList);
+        if(!$freightData = GoodsService::make()->getFreight($userId, $freightAddressId, $skus)){
+            $this->error ='2905';
+            return false;
+        }
+
+        $freight = isset($freightData['freight'])? floatval($freightData['freight']) : 0;
+        $payTotal = moneyFormat($orderXdTotal+$freight,2);
+        //var_dump($payTotal, $amount);
+        if(intval($amount) != intval($payTotal)){
+            $this->error ='2906';
+            return false;
+        }
+
         // 星豆余额支付验证
         if($payType == 10 && $userXd < $payTotal){
             $this->error = 2304;