fix:agent Bug修改

yt-agent/agent-service/src/main/resources/mapper/AppUserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ytpm.dao.dyz.AppUserMapper">
+<mapper namespace="com.ytpm.dao.AppUserMapper">
     <select id="selectAppUserList" resultType="com.ytpm.app.view.YtAppUserListView">
         select
             au.user_id,

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/WxController.java

@@ -122,7 +122,9 @@ public class WxController {
     public Result<?> iosLoginCheck(@RequestBody IosLoginParam param) {
         YtDyzUser user = appUserMapper.selectByIosId(param.getIosId());
         if (user == null) {
-            return Result.resultErr(RepMessage.OBJECT_NOT_EXIST);
+            IosUserInfo userInfo = setIosUserInfo(param);
+            YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo);
+            return Result.resultObjOk(old);
         }
         List<YtDyzAdRecord> adRecordList = recordMapper.getByIosId(param.getIosId());
         user.setPreAdRecordList(adRecordList);
@@ -166,11 +168,16 @@ public class WxController {
 
     private IosUserInfo setIosUserInfo(IosLoginParam param){
         IosUserInfo userInfo = new IosUserInfo();
-        userInfo.setOpenid(param.getIosId());
-        userInfo.setHeadimgurl(param.getIconUrl());
+        userInfo.setOpenid(param.getIosId() ==  null ? "" : param.getIosId());
+        userInfo.setHeadimgurl(param.getIconUrl()  ==  null ? "" : param.getIconUrl());
         if (StrUtil.isEmpty(param.getAlias())){
-            YtDyzUser user = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
-            if (StrUtil.isEmpty(user.getNickName())) {
+            YtDyzUser user;
+            if (param.getDitchId() == null){
+                user = appUserMapper.selectByIosId(param.getIosId());
+            } else {
+                user = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
+            }
+            if (user == null  || StrUtil.isEmpty(user.getNickName())) {
                 userInfo.setNickname("Tourists" + IdUtil.fastSimpleUUID().substring(0, 8));
             } else {
                 userInfo.setNickname(user.getNickName());

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

@@ -92,7 +92,12 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo) {
-        YtDyzUser old = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
+        YtDyzUser old;
+        if (param.getDitchId() == null){
+            old = appUserMapper.selectByIosId(param.getIosId());
+        } else {
+            old = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
+        }
         if(Objects.isNull(old)) {
             old = new YtDyzUser();
             registryUserForIos(param,userInfo, old);