Merge branch 'fix/adapt-lixiao-login-push-notification' into dev

app/controllers/pushs_controller.rb

@@ -44,7 +44,7 @@ class PushsController < ApplicationController
 
     params[:sync_push] ||= false
     # if validate_token(params[:app_name], token_array.first)
-      push_sync(params[:sync_push], {user_ids: user_ids, message: message, igetui_opts: igetui_opts.merge(pusher_type: 'push_message_to_list')})
+      push_sync(params[:sync_push], {user_ids: user_ids, message: message, igetui_opts: igetui_opts.merge(pusher_type: 'push_message_to_list'), user_platform: params[:user_platform]})
 
       render json: { code: 0, message: 'success', describe: '异步任务正在处理'}
     # else

app/controllers/user_devices_controller.rb

@@ -13,7 +13,7 @@ class UserDevicesController < ApplicationController
     user_id = _user_device_params[:user_id]
     
     UserDevice.where(user_id: user_id,user_platform: _user_device_params[:user_platform]).delete_all
-    UserDevice.where(client_id: _user_device_params[:client_id]).delete_all
+    UserDevice.where(client_id: _user_device_params[:client_id],user_platform: _user_device_params[:user_platform]).delete_all
 
     user_device = UserDevice.create!(_user_device_params)
 
@@ -30,8 +30,8 @@ class UserDevicesController < ApplicationController
     old_user_id = params[:old_user_id]
     user_device = UserDevice.where(user_id: old_user_id,user_platform: params[:user_platform]).last
     if user_device.present?
-      UserDevice.where(user_id: user_id).delete_all
-      UserDevice.where(user_id: old_user_id).delete_all
+      UserDevice.where(user_id: user_id,user_platform: params[:user_platform]).delete_all
+      UserDevice.where(user_id: old_user_id,user_platform: params[:user_platform]).delete_all
 
       new_user_device = user_device.dup
 

app/services/push_tool_client.rb

@@ -62,7 +62,9 @@ class PushToolClient
       huawei_client_ids = {"#{@opts[:app_type]}" => @opts[:device_ids_opts][:huawei]} if push_devices.include? "huawei"
       xiaomi_client_ids = {"#{@opts[:app_type]}" =>  @opts[:device_ids_opts][:xiaomi]} if push_devices.include? "xiaomi"  
     else
-      push_device_collections = UserDevice.where(user_id: @user_ids).group_by(&:platform)
+      user_devices = UserDevice.where(user_id: @user_ids)
+      user_devices = user_devices.where(user_platform: @opts[:user_platform]) if opts[:user_platform].present?
+      push_device_collections = user_devices.group_by(&:platform)
 
       igetui_push_device_collections = push_device_collections['igetui'].group_by(&:device_platform) if push_device_collections['igetui'].is_a? Array
       if igetui_push_device_collections.is_a? Hash