Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into data_rules-m

app/api/logic/ActivityLogic.php

@@ -263,7 +263,7 @@ class ActivityLogic extends BaseLogic
             if(empty($coupon_ids)){
                 return true;
             }
-            $property_activity_id = UserCoupon::where('user_id',$serviceOrder->user_id)->whereIn('coupon_id',$coupon_ids)->where('property_activity_id','>',0)->value('property_activity_id');
+            $property_activity_id = UserCoupon::where('user_id',$serviceOrder->user_id)->whereIn('id',$coupon_ids)->where('property_activity_id','>',0)->value('property_activity_id');
             if(empty($property_activity_id)){
                 return true;
             }