资产变动明细

application/admin/controller/user/Airdrop.php

@@ -99,15 +99,13 @@ class Airdrop extends Backend
             if($params['type_id'] == 0){
                 $user = (new UserModel)->getByAddress($params['address']);
                 if(empty($user)) throw new Exception('用户不存在');
-                $resp = WelfareLoginc::setUserWelfareLos($user->id, $params['product_id'], $params['num'], time(), 'zh', ProductOrder::Airdrop);
-                //添加Rwa数
-                if($resp['price'] > config('min_rwa_price')) UserModel::updateForRwaNum($user->id, $user->parent_id, $params['num'], '+');
+                WelfareLoginc::setUserProductOrder($params['num'], 0, 0, 0, $params['product_id'], $user->id, ProductOrder::Airdrop);
                 $params['status'] = 1;
             }
             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 -$result->init_num - $result->num)) throw new Exception(__('库存不足'));
+                // $result = ProductPopular::getPopularByTime($params['product_id'], 'zh', strtotime($params['start_time']));
+                //if(!$result || $totalNum > ($result->stock -$result->init_num - $result->num)) throw new Exception(__('库存不足'));
                 $params['total_num'] = $totalNum;
             }
             if(!empty($params['area_id'][0])){

application/api/controller/Ledger.php

@@ -68,7 +68,7 @@ class Ledger extends Api
     {
         $type_id  = $this->request->post('query.action'); // 账变类型
         $coin_type  = $this->request->post('query.coin_type'); // 資金类型
-        $where = ['user_id' => 1275];
+        $where = ['user_id' => $this->auth->id];
         if ($type_id > 0) $where['action'] = $type_id;
         switch ($coin_type){
             case 'token':

application/api/logic/WelfareLoginc.php

@@ -35,9 +35,8 @@ 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(__('库存不足'));
-        //echo 111;die;
+      
         //添加产品
         self::setUserProductOrder($num, $result->is_area, $result->id, $result->price, $productId, $uid, $typeId);
         return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num, 'price'=>$result->price];
@@ -104,7 +103,7 @@ class WelfareLoginc
         $user = new UserModel();
         foreach($list as $order){
                 //根据$mod的值决定是否需要对用户的rwa_num进行乘以$div的运算
-                $num = ($mod == 1)? bcmul($order->total_num, $div) : $num;
+                $num = ($mod == 1)? bcmul($order->total_num, $div): $num;
                 // 尝试为用户设置产品订单，如果成功，则更新用户的rwa_num
                 if(!empty(self::setUserProductOrder($num, $isArea, $orderId, $price, $productId, $order->user_id, ProductOrder::Airdrop))){
                  
@@ -121,7 +120,6 @@ class WelfareLoginc
      *
      * 该方法根据是否需要区域信息来设置用户的订单信息如果没有指定区域，则调用setPopularNoAreaOrder方法，
      * 否则，首先查询产品关联的区域ID，然后调用setPopularAreaOrder方法设置订单信息
-     *
      * @param int $num 订单数量
      * @param bool $isArea 是否需要区域信息
      * @param mixed $orderId 订单ID
@@ -129,7 +127,6 @@ class WelfareLoginc
      * @param int $productId 产品ID
      * @param int $uid 用户ID
      * @param int $typeId 订单类型ID
-     *
      * @return mixed 返回订单设置结果
      */
     public static function setUserProductOrder(int $num, $isArea, $orderId, $price, $productId, $uid, $typeId)