库存

application/admin/controller/user/Airdrop.php

@@ -107,7 +107,7 @@ class Airdrop extends Backend
             if($params['type_id'] == 1){
                 $totalNum = WelfareLoginc::getUserRwaProductNum($params['rwa_product_id'], $params['rwa_num'], $params['rwa_mod'], $params['num']);
                 $result = ProductPopular::getPopularByTime($params['product_id'], 'zh', strtotime($params['start_time']));
-                if(!$result || $totalNum > $result->stock) throw new Exception(__('库存不足'));
+                if(!$result || $totalNum > ($result->init_num + $result->num)) throw new Exception(__('库存不足'));
                 $params['total_num'] = $totalNum;
             }
             if(!empty($params['area_id'][0])){

application/api/logic/WelfareLoginc.php

@@ -35,7 +35,7 @@ class WelfareLoginc
     public static function setUserWelfareLos($uid, int $productId, $num, $tim, $lan, $typeId)
     {   
         $result = ProductPopular::getPopularByTime($productId, $lan, $tim);
-        if(!$result || $num > $result->stock) throw new Exception(__('库存不足'));
+        if(!$result || $num > ($result->init_num + $result->num)) throw new Exception(__('库存不足'));
         
         //添加产品
         self::setUserProductOrder($num, $result->is_area, $result->id, $result->price, $productId, $uid, $typeId);

application/common/model/ProductPopular.php

@@ -88,7 +88,7 @@ class ProductPopular extends Model
 
 
     //获取当前抢购产品
-    public static function getPopularByTime(int $productId, string $lan, $tim)
+    public static function getPopularByTime( $productId, string $lan, $tim)
     {   
        return self::alias('a')
            ->where('a.start_time', '>=', $tim)