新需求-活动需求-天降首充好礼调整

application/common.php

@@ -1185,14 +1185,6 @@ function handelCharge($where,$data){
             db::rollback();
             return 0;
         }
-        //首充
-        if($is_first_charge == 0){
-            $first_recharge = model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']);
-//            if($first_recharge['code'] != 1){
-//                db::rollback();
-//                return 0;
-//            }
-        }
 
         //给上级返佣
         //获取上级
@@ -1204,9 +1196,16 @@ function handelCharge($where,$data){
                 return 0;
             }
         }
-
-
         db::commit();
+
+        //首充
+        if($is_first_charge == 0){
+            model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']);
+        }
+        //天降好礼
+        model('Activities')->drop_gift_send($orderModel['user_id'],$orderModel['money']);
+
+
         return 1;
     } catch (\Exception $e){
         db::rollback();