会员关联项目 合并最新代码

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserCompanyUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.fs.store.mapper.FsUserCompanyUserMapper;
 import com.fs.store.service.IFsUserCompanyUserService;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -162,6 +163,7 @@ public class FsUserCompanyUserServiceImpl extends ServiceImpl<FsUserCompanyUserM
 //        userCompanyUser.setIsRepeatFans(hasBind ? 1 : 0);
         userCompanyUser.setIsRepeatFans(0);
         userCompanyUser.setStatus(status);
+        userCompanyUser.setCreateTime(LocalDateTime.now());
         save(userCompanyUser);
         return userCompanyUser;
     }

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -1010,17 +1010,6 @@ public class FsUserServiceImpl implements IFsUserService
             return ResponseResult.fail(406,"该用户已成为其他销售会员");
         }
 
-        //2025.7.10 解决在不知销售已经审核的情况下 多次点击
-        if (fsUser.getIsBecomeMember() == 1){
-            if(fsUser.getStatus() == 0){
-                //禁用
-                return ResponseResult.fail(402, "已成功注册，待管理审核");
-            } else {
-                return ResponseResult.ok(Boolean.TRUE); //已经成为会员
-            }
-        }
-        fsUser.setIsBecomeMember(1);
-
         // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
         Company company = companyMapper.selectCompanyById(param.getCompanyId());
         // isDefaultBlack 值为1 ，表示需要加入小黑屋，否则不加