赠送RWA茶商品

application/api/controller/Chabao.php

@@ -165,7 +165,7 @@ class Chabao extends Api
             $item['reason'] = '手机号未注册';
             foreach($user as &$item_1){
                 if($item['mobile']==$item_1['phone']){
-                    $ret = $order_model->setGiverwagoods(0, 0, $item['product_id'], $item_1['id'], $order_model::Airdrop);
+                    $ret = $order_model->setGiverwagoods(0, 0, $item['product_id'], $item_1['id'], $order_model::Giveaway);
                     if ($ret) {
                         $item['gift_record_type'] = 1;
                         $item['reason'] = '赠送RWA茶成功';

application/common/model/ProductOrder.php

@@ -309,12 +309,12 @@ class ProductOrder extends Model
     {
         //抢购订单
         $time = time();
-        $is_popular = ($typeId == self::Giveaway) ? self::Closure : 0;
+        $is_popular = 0;
         $data = [
             'order_id' => $orderId,
             'product_id' => $productId,
             'type_id' => $typeId,
-            'status' => self::Closure,
+            'status' => 1,
             'area_id' => 0,
             'price' => $price,
             'popular_price' => $price,