Browse Source

Merge branch 'master' of https://git.hxiaoju.top/Teapay/RWACha-API

afa 6 months ago
parent
commit
c81c9e7ef2
1 changed files with 13 additions and 11 deletions
  1. 13 11
      application/common/logic/AirdropLogic.php

+ 13 - 11
application/common/logic/AirdropLogic.php

@@ -4,6 +4,7 @@
 namespace app\common\logic;
 
 use app\common\model\Config;
+use app\common\model\ProductLists;
 use app\common\model\ProductOrder;
 use app\common\model\UserAirdrop;
 use app\api\logic\WelfareLoginc;
@@ -136,20 +137,21 @@ class AirdropLogic
         }
 
         // 获取指定产品的热门信息
-        $result = ProductPopular::getPopularByTime($user_welfare['super_product_id'], 'zh', $info->create_time);
-        $stock = $result->stock - $result->num - $result->init_num;
+        $result = (new ProductLists())->where('id', $user_welfare['super_product_id'])->find();
+//        $result = ProductPopular::getPopularByTime($user_welfare['super_product_id'], 'zh', $info->create_time);
+//        $stock = $result->stock - $result->num - $result->init_num;
         // 检查库存是否足够
-        if(!$result || count($send_user_ids) > $stock) {
-            // 如果库存不足,输出信息并返回false
-            (new Output())->writeln("本次执行库存不足:应发发".count($send_user_ids) * $num."套,库存:" . $stock);
-            return false;
-        }
+//        if(!$result || count($send_user_ids) > $stock) {
+//            // 如果库存不足,输出信息并返回false
+//            (new Output())->writeln("本次执行库存不足:应发发".count($send_user_ids) * $num."套,库存:" . $stock);
+//            return false;
+//        }
 
         foreach ($send_user_ids as $user_id){
-            $rs = WelfareLoginc::setUserProductOrder($num, $result['is_area'], $info['user_id'], $result['price'], $result['product_id'], $user_id, ProductOrder::Airdrop);
-            if($rs && $result['price'] >= config('min_rwa_price')){
-                (new UserModel())->updateForRwaNum($user_id, UserModel::getByParentId($user_id), $num, '+');
-            }
+            $rs = WelfareLoginc::setUserProductOrder($num, false, $info['user_id'], 0, $result['id'], $user_id, ProductOrder::Airdrop);
+//            if($rs && $result['price'] >= config('min_rwa_price')){
+//                (new UserModel())->updateForRwaNum($user_id, UserModel::getByParentId($user_id), $num, '+');
+//            }
         }
 
         // 更新信息列表的状态和备注