gift no activity

app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -878,7 +878,7 @@ class OrdersController extends Controller
                 ];
                 UserService::PushUserActionToQueue($action_type, $distribution_channel_id, $param);
                 //用户属性
-                $this->userProperty($uid,$price,$product->type);
+                $this->userProperty($uid,$price,$product->type,$order->activity_id);
                 return true;
             } catch (\Exception $e) {
                 DB::rollback();
@@ -1024,7 +1024,7 @@ class OrdersController extends Controller
                     $this->successPayPushMsg($uid, $product, $order->id);
                     $this->orderStatistical($order);
                     DB::commit();
-                    $this->userProperty($uid,$price,$product->type);
+                    $this->userProperty($uid,$price,$product->type,$order->activity_id);
                     $this->huaweiActivity($order->activity_id,$uid,$product_id);
                     //redis 删除未支付的uid
                     try {
@@ -1135,7 +1135,7 @@ class OrdersController extends Controller
                 $this->successPayPushMsg($uid, $product, $order->id);
                 $this->orderStatistical($order);
                 DB::commit();
-                $this->userProperty($uid,$price,$product->type);
+                $this->userProperty($uid,$price,$product->type,$order->activity_id);
                 $this->huaweiActivity($order->activity_id,$uid,$product_id);
                 //redis 删除未支付的uid
                 $key = 'leyuee:to_send_not_pay_uid:distribution_channel_id' . $distribution_channel_id;
@@ -1272,7 +1272,7 @@ class OrdersController extends Controller
                     ];
                     UserService::PushUserActionToQueue($action_type, $distribution_channel_id, $param);
 
-                    $this->userProperty($uid,$price,$product->type);
+                    $this->userProperty($uid,$price,$product->type,$order->activity_id);
                     $this->huaweiActivity($order->activity_id,$uid,$product_id);
 
                 }
@@ -1712,10 +1712,12 @@ class OrdersController extends Controller
         return 0;
     }
 
-    private function userProperty($uid,$price,$charge_type){
+    private function userProperty($uid,$price,$charge_type,$activity_id){
         try{
             $old_property = UserDivisionCpcPropertyService::getUserProperty($uid);
-            $this->chargeGiveGift($uid,$old_property,$price,$charge_type);
+            if(!$activity_id){
+                $this->chargeGiveGift($uid,$old_property,$price,$charge_type);
+            }
             $userproperty = UserDivisionCpcPropertyService::getUserSubscribeAndChargeInfoByUid($uid);
             if(!$userproperty) {
                 return ;