java/jiashida.git

			@@ -418,6 +418,44 @@
			if (appUser.getCompanyId() == null) {
			Integer companyId = null;

			// 判断是否同时存在两种推荐来源且推荐状态为临时
			boolean hasBothReferrer = appUser.getReferrerUserId() != null
			&& Integer.valueOf(1).equals(appUser.getReferrerStatus())
			&& appUser.getReferrerSysUserId() != null;

			if (hasBothReferrer) {
			// 两种推荐来源都存在，比较推荐时间，取后推荐的用户的 companyId
			LocalDateTime referrerTime = appUser.getReferrerTime();
			LocalDateTime referrerSysUserTime = appUser.getReferrerSysUserTime();

			// 判断哪个推荐时间更晚
			boolean useSysUserCompany = false;
			if (referrerSysUserTime != null && referrerTime != null) {
			useSysUserCompany = referrerSysUserTime.isAfter(referrerTime);
			} else if (referrerSysUserTime != null) {
			useSysUserCompany = true;
			}
			// 如果 referrerTime != null 且 referrerSysUserTime == null，则 useSysUserCompany 保持 false

			if (useSysUserCompany) {
			// 使用股东（SysUser）的 companyId
			SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appUser.getReferrerSysUserId()));
			if (sysUser != null && sysUser.getCompanyId() != null) {
			companyId = sysUser.getCompanyId();
			log.info("用户{}两种推荐来源都存在，股东推荐时间({})晚于普通推荐时间({})，通过股东(SysUser:{})关联公司{}",
			appUserId, referrerSysUserTime, referrerTime, appUser.getReferrerSysUserId(), companyId);
			}
			} else {
			// 使用推荐人（TAppUser）的 companyId
			TAppUser referrerAppUser = appUserService.getById(appUser.getReferrerUserId());
			if (referrerAppUser != null && referrerAppUser.getCompanyId() != null) {
			companyId = referrerAppUser.getCompanyId();
			log.info("用户{}两种推荐来源都存在，普通推荐时间({})晚于或等于股东推荐时间({})，通过推荐人(TAppUser:{})关联公司{}",
			appUserId, referrerTime, referrerSysUserTime, appUser.getReferrerUserId(), companyId);
			}
			}
			} else {
			// 只有一种推荐来源，按原逻辑处理
			// 优先使用 referrerSysUserId 对应的 SysUser 的 companyId
			if (appUser.getReferrerSysUserId() != null) {
			SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appUser.getReferrerSysUserId()));
			@@ -435,6 +473,7 @@
			log.info("用户{}通过推荐人(TAppUser:{})关联公司{}", appUserId, appUser.getReferrerUserId(), companyId);
			}
			}
			}

			if (companyId != null) {
			appUser.setCompanyId(companyId);