fix

src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java

@@ -345,7 +345,7 @@ public class AppController implements IBaseController {
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, null, "", tenantId);
         AuthBean bean = sessionService.createSession(user, loginProperties, LoginType.SUPERLOGINTWO.ordinal());
         // 不同渠道用户补签不同模板合同
-        userService.channelUserSignContract(user, true);
+        userService.channelUserSignContract(user, registerFrom);
         log.info("第三方用户登录成功 [AppController] login2 --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
         return JsonResult.buildSuccessResult("登录成功", bean);
     }

src/main/java/cn/quantgroup/xyqb/event/BlackHoleRegisteredEventListener.java

@@ -61,6 +61,6 @@ public class BlackHoleRegisteredEventListener implements ApplicationListener<Reg
                 array.toString());
         });
         // 不同渠道签署不同的合同模板
-        userService.channelUserSignContract(user, false);
+        userService.channelUserSignContract(user, null);
     }
 }

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -121,5 +121,5 @@ public interface IUserService {
     /**
      * 渠道用户签署合同
      */
-    void channelUserSignContract(User user, boolean needCheck);
+    void channelUserSignContract(User user, Long loginFrom);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -677,14 +677,24 @@ public class UserServiceImpl implements IUserService, IBaseController {
     /**
      * 不同渠道用户签署不同合同模板
      * @param user
-     * @param needCheck
+     * @param loginFrom
      */
-    public void channelUserSignContract(User user, boolean needCheck) {
+    public void channelUserSignContract(User user, Long loginFrom) {
         if (Objects.isNull(user) || StringUtils.isBlank(channelTemplate)) {
             return;
         }
+        // 如果登录来源和注册来源相同，不用补签合同
+        if (Objects.nonNull(loginFrom) && Objects.equals(user.getRegisteredFrom(), loginFrom)) {
+            return;
+        }
         Map<String, Long> channelMap = JSON.parseObject(channelTemplate, new TypeReference<HashMap<String, Long>>() {});
         Long templateId = channelMap.get(String.valueOf(user.getRegisteredFrom()));
+        boolean needCheck = false;
+        if (Objects.nonNull(loginFrom) && !Objects.equals(user.getRegisteredFrom(), loginFrom)) {
+            templateId = channelMap.get(String.valueOf(loginFrom));
+            needCheck = true;
+        }
+
         if (Objects.isNull(templateId)) {
             return;
         }