wesmiler 1 年之前
父节点
当前提交
28d8cd114d

+ 2 - 1
app/Services/Api/GoodsService.php

@@ -511,7 +511,8 @@ class GoodsService extends BaseService
             RedisService::set($cacheKey, ['freight'=>$xdFreight,'fee'=> $freight], rand(5,10));
             return ['freight'=>$xdFreight,'fee'=> $freight];
         }else{
-            $this->error = 1052;
+            $errorCode = SupplyService::make()->getError();
+            $this->error = $errorCode? $errorCode : 1052;
             return false;
         }
     }

+ 1 - 1
app/Services/Api/OrderService.php

@@ -287,7 +287,7 @@ class OrderService extends BaseService
         // 运费
         $skus = array_values($skuList);
         if(!$freightData = GoodsService::make()->getFreight($userId, $freightAddressId, $skus)){
-            $this->error ='2905';
+            $this->error = GoodsService::make()->getError()?? 2905;
             return false;
         }
 

+ 1 - 1
app/Services/SupplyService.php

@@ -168,7 +168,7 @@ class SupplyService extends BaseService
         if($errCode == 0){
             return $result;
         }else{
-            $this->error = $errMsg? $errMsg : 1045;
+            $this->error = $errCode==2009? '11'.$errCode : ($errMsg? $errMsg : 1045);
             return false;
         }
     }

+ 2 - 1
resources/lang/zh-cn/api.php

@@ -195,7 +195,8 @@ return [
     '2918'=> '没有可售后的商品,请联系客服',
     '2919'=> '订单商品存在不可售后商品,请联系客服',
 
-    
+
+    '112009'=> '供应商账户余额不足,请联系客服',
     '我正在直播,快来看看吧'=>'我正在直播,快来看看吧',
     '打赏消费通知'=>'打赏消费通知',
     '打赏消费通知内容'=>'您在:time(UTC+8)打赏了:money星豆给主播:live_name',