库存

application/api/controller/Airdrop.php

@@ -47,6 +47,7 @@ class Airdrop extends Api
         try {
             //添加Rwa茶记录
             $result = WelfareLoginc::setUserWelfareLos($this->auth->id, $row->new_product_id, $row->new_num, time(), $this->lan, $productOrder::Newbie);
+
             //添加茶数量
             if($result['price'] > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, $row->new_num, '+');
             Db::commit();

application/api/logic/WelfareLoginc.php

@@ -35,6 +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-$result->init_num - $result->num)) throw new Exception(__('库存不足'));
         
         //添加产品

application/common/model/ProductPopular.php

@@ -91,8 +91,8 @@ class ProductPopular extends Model
     public static function getPopularByTime( $productId, string $lan, $tim)
     {   
        return self::alias('a')
-           ->where('a.start_time', '>=', $tim)
-           ->where('a.end_time', '<=', $tim)
+           ->where('a.start_time', '<=', $tim)
+           ->where('a.end_time', '>=', $tim)
            ->join('product_list b', "a.product_id = b.id", "left")
            ->field('a.*,b.is_area,'.$lan.'_name as name')
            ->where('a.product_id', $productId)->find();