添加新人福利

application/api/controller/Airdrop.php

@@ -39,7 +39,6 @@ class Airdrop extends Api
       
         $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
         if(!empty($info)) $this->error(__('您已领取'));
-
         Db::startTrans();
         try {
             //添加Rwa茶记录
@@ -57,11 +56,19 @@ class Airdrop extends Api
 
 
     //超级福利
-    public function super()
+    public function getSuper()
     {
        
         $this->success('', $info);
     }
 
 
+    //超级福利
+    public function setSuperWeal()
+    {
+    
+        $this->success('', $info);
+    }
+
+
 }

application/api/controller/Order.php

@@ -48,9 +48,9 @@ class Order extends Api
             
             //批量地区添加 1选择地区 2未选择地区
             if($params['type'] == 1)
-                $result = $productOrder::setPopularAreaOrder($areaArr, $params['order_id'], $order_info->price, $params['product_id'], $this->auth->id);
+                $result = $productOrder::setPopularAreaOrder($areaArr, $params['order_id'], $order_info->price, $params['product_id'], $this->auth->id, ProductOrder::Popular);
             else
-                $result =$productOrder::setPopularNoAreaOrder($areaNum, $params['order_id'], $order_info->price, $params['product_id'], $this->auth->id);
+                $result =$productOrder::setPopularNoAreaOrder($areaNum, $params['order_id'], $order_info->price, $params['product_id'], $this->auth->id,ProductOrder::Popular);
             
             //余额记录
             $ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::TOKEN, -$totalPrice, $ledgerWalletModel::Popular, $this->auth->id);

application/api/logic/WelfareLoginc.php

@@ -39,10 +39,10 @@ class WelfareLoginc
                 ->where('a.product_id', $productId)->find();
         if($num > $result->stock) throw new Exception(__('库存不足'));       
         if(empty($result->is_area)){
-            ProductOrder::setPopularNoAreaOrder($num, $result->id, $result->price, $result->product_id, $uid);
+            ProductOrder::setPopularNoAreaOrder($num, $result->id, $result->price, $result->product_id, $uid, ProductOrder::Newbie);
         }else{
             $areaArr = ProductArea::where('product_id', $productId)->where('status', ProductArea::NORMAL)->orderRaw('RAND()')->limit($num)->column('id');
-            ProductOrder::setPopularAreaOrder($areaArr, $result->id, $result->price, $result->product_id, $uid);
+            ProductOrder::setPopularAreaOrder($areaArr, $result->id, $result->price, $result->product_id, $uid, ProductOrder::Popular);
         }
         return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num];
     }

application/common/model/ProductOrder.php

@@ -53,28 +53,28 @@ class ProductOrder extends Model
 
 
     //抢购下单：未选择地区购买
-    public static function setPopularNoAreaOrder($num, $order_id, $price, $product_id, $uid):bool
+    public static function setPopularNoAreaOrder($num, $orderId, $price, $productId, $uid, $typeId):bool
     {
         for ($i = 0; $i < $num; $i++) {
             $order_arr['price']     = $price;
-            $order_arr['product_id']= $product_id;
+            $order_arr['product_id']= $productId;
             $order_arr['area_id']   = 0;
-            self::setCreateOrder($order_id, $order_arr, self::Popular, $uid, 0, getOrderSN('R'), 0, $price);
+            self::setCreateOrder($orderId, $order_arr, $typeId, $uid, 0, getOrderSN('R'), 0, $price);
         }
         return true;
     }
 
 
     //抢购下单：选择地区购买
-    public static function setPopularAreaOrder($areaArr, $order_id, $price, $product_id, $uid):bool
+    public static function setPopularAreaOrder($areaArr, $orderId, $price, $productId, $uid, $typeId):bool
     {
         $result = true;
         foreach ($areaArr as $item) {
             // 生成订单
             $order_arr['price']     = $price;
-            $order_arr['product_id']= $product_id;
+            $order_arr['product_id']= $productId;
             $order_arr['area_id']   = $item;
-            self::setCreateOrder($order_id, $order_arr, self::Popular, $uid, 0, getOrderSN('R'), 0, $price);
+            self::setCreateOrder($orderId, $order_arr, $typeId, $uid, 0, getOrderSN('R'), 0, $price);
         }
         //修改区域状态
         $count = ProductArea::whereIn('id', $areaArr)->setField('status', ProductLists::STOP);