fix:ios端用户登陆获取用户重复bug修复

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/dao/AppUserMapper.java

@@ -36,12 +36,12 @@ public interface AppUserMapper {
     /**
      * openid查询用户信息
      */
-    YtDyzUser getYtAppUser(@Param("openid")String openid,@Param("ditchId")long ditchId);
+    YtDyzUser getYtAppUser(@Param("openid")String openid,@Param("ditchId")Long ditchId);
 
     /**
      * openid查询用户信息
      */
-    YtDyzUser getYtAppUserForIos(@Param("iosId")String iosId,@Param("ditchId")long ditchId);
+    YtDyzUser getYtAppUserForIos(@Param("iosId")String iosId,@Param("ditchId")Long ditchId);
 
     /**
      * 主键查询
@@ -103,7 +103,7 @@ public interface AppUserMapper {
     /**
      * 根据应用类型查询应用默认配置
      */
-    WxDefaultConfig getDefaultConfig(@Param("appType") int appType);
+    WxDefaultConfig getDefaultConfig(@Param("appType") Integer appType);
 
     /**
      * 根据应用ID查询应用默认配置

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/service/impl/AppUserServiceImpl.java

@@ -206,7 +206,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo, LoginType loginType) {
-        YtDyzUser old = appUserMapper.selectByIosId(param.getIosId());
+        YtDyzUser old = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
         if (Objects.isNull(old)) {
             old = registryUserByIos(param, userInfo);
         } else {

yt-ios-lemon/lemon-ios-service/src/main/resources/mapper/AppUserMapper.xml

@@ -290,7 +290,10 @@
             user_id, app_id,phone,device_id, ditch_id, nick_name,head_img, power, registry_time, last_login_time, last_login_ip, login_days, total_video, total_income, red_packet_balance, red_packet_amount, points_balance, points_total, withdraw_total, sign_days, user_status, risk_reason, wx_open_id, ios_id, platform_id
         from yt_dyz_user
         where ios_id = #{iosId}
-          and ditch_id = #{ditchId}
+        <if test="ditchId != null">
+            and ditch_id = #{ditchId}
+        </if>
+        limit 1
     </select>
     <select id="queryAll" resultType="com.ytpm.app.view.YtAppUserListView">
         select