需求(邀请码 过程页配置)

fs-common/src/main/java/com/fs/common/core/domain/entity/SysDictData.java

@@ -85,7 +85,7 @@ public class SysDictData extends BaseEntity
     }
 
     @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    @Size(min = 0, max = 255, message = "字典键值长度不能超过255个字符")
     public String getDictValue()
     {
         return dictValue;

fs-service/src/main/java/com/fs/company/domain/CompanyUser.java

@@ -184,6 +184,10 @@ public class CompanyUser extends BaseEntity
     /** 邀请码 */
     private String invitationCode;
 
+    /** 邀请人名称 */
+    @TableField(exist = false)
+    private String invitationName;
+
     @TableField(exist = false)
     private List<Long> deptList;
 

fs-service/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -36,6 +36,9 @@ public interface CompanyUserMapper
      */
     public CompanyUser selectCompanyUserById(Long userId);
 
+    @Select("select * from company_user where user_id=#{invitedSalesId} and del_flag=0")
+     CompanyUser getInviteCodeByCompanyUserIdAndUserId(@Param("invitedSalesId") Long invitedSalesId);
+
     /**
      * 查询物业公司管理员信息列表
      *

fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -269,4 +269,9 @@ public interface ICompanyUserService {
      * 根据销售获取邀请码
      */
     String getInviteCodeByCompanyUserId(Long companyUserId);
+
+    /**
+     * 根据销售绑定关系获取销售邀请码
+     */
+    CompanyUser getInviteCodeByCompanyUserIdAndUserId( Long userId);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -1310,6 +1310,15 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         return inviteCode;
     }
 
+    @Override
+    public CompanyUser getInviteCodeByCompanyUserIdAndUserId(Long userId) {
+        CompanyUser companyUser = companyUserMapper.getInviteCodeByCompanyUserIdAndUserId(userId);
+        if (companyUser != null) {
+            return companyUser;
+        }
+        return null;
+    }
+
     /**
      * 生成基础邀请码
      */

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -1817,9 +1817,7 @@ public class FsUserServiceImpl implements IFsUserService {
             throw new CustomException("邀请码不存在");
         }
          if(fsUser.getInvitedBySalesId() != null){
-            if(!fsUser.getInvitedBySalesId().equals(salesId)){
-                throw new CustomException("该用户已从其他销售的链接下载");
-            }else {
+            if(fsUser.getInvitedBySalesId().equals(salesId)){
                 throw new CustomException("已发送给app下载链接给该用户");
             }
         }

fs-service/src/main/resources/mapper/course/FsUserCoursePeriodMapper.xml

@@ -83,7 +83,7 @@
             <if test="periodLine != null "> and period_line = #{periodLine}</if>
         </where>
         group by fs_user_course_period.period_id
-        order by fs_user_course_period.period_status,create_time desc
+        order by fs_user_course_period.period_status,period_starting_time desc
     </select>
 
     <select id="selectFsUserCoursePeriodById" parameterType="Long" resultMap="FsUserCoursePeriodResult">

fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -428,4 +428,16 @@ public class CompanyUserController extends AppBaseController {
         return R.ok(fsUserService.syncCompanyUser(companyUserId, companyId));
     }
 
+    /**
+     * 根据销售获取邀请码
+     *
+     * @return
+     */
+    @GetMapping("/getInviteCode")
+    @ApiOperation("根据销售获取邀请码")
+    public R getInviteCode(Long salesId) {
+        String inviteCode = companyUserService.getInviteCodeByCompanyUserId(salesId);
+        return R.ok().put("inviteCode", inviteCode);
+    }
+
 }

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -12,6 +12,9 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.sign.Md5Utils;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyUserService;
+import com.fs.course.service.IFsUserCompanyUserService;
 import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.his.domain.FsDoctor;
 import com.fs.his.domain.FsUser;
@@ -82,6 +85,9 @@ public class UserController extends  AppBaseController {
 
     @Autowired
     private IFsUserService fsUserService;
+
+    @Autowired
+    private ICompanyUserService companyUserService;
     @Login
     @ApiOperation("获取用户信息")
     @PostMapping("/friendsSearch")
@@ -121,8 +127,11 @@ public class UserController extends  AppBaseController {
             if (user.getPhone()!=null&&user.getPhone().length()>11&&!user.getPhone().matches("\\d+")){
                 user.setPhone(decryptPhoneMk(user.getPhone()));
             }
+            CompanyUser companyUser = companyUserService.getInviteCodeByCompanyUserIdAndUserId(user.getInvitedBySalesId());
+            companyUser.setInvitationName(StringUtils.isNotEmpty(companyUser.getNickName())?companyUser.getNickName():"");
             Map<String,Object> map=new HashMap<>();
             map.put("user",user);
+            map.put("inviteInfo",companyUser);
             return R.ok(map);
         } catch (Exception e){
             return R.error("操作异常");

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -118,6 +118,27 @@ public class WxUserController extends AppBaseController{
             this.logger.info(session.getOpenid());
             // 解密
             WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
+            // 检查是否为受限手机号或姓名
+            String phoneNumber = phoneNoInfo.getPhoneNumber();
+            String nickname = "微信用户" + phoneNumber.substring(phoneNumber.length() - 4);
+
+            // 定义受限手机号和姓名
+            String[] restrictedPhones = {"18335377053", "19516034880"};
+            String[] restrictedNames = {"刘今朝", "李中华"};
+
+            // 检查手机号是否受限
+            for (String restrictedPhone : restrictedPhones) {
+                if (phoneNumber.equals(restrictedPhone)) {
+                    return R.error("无法注册，请联系客服");
+                }
+            }
+
+            // 检查姓名是否受限
+            for (String restrictedName : restrictedNames) {
+                if (nickname.contains(restrictedName)) {
+                    return R.error("无法注册，请联系客服");
+                }
+            }
             //三端用户同步，先用unionid查询
             FsUser user = new FsUser();
             if (session.getUnionid()!=null){
@@ -131,7 +152,6 @@ public class WxUserController extends AppBaseController{
 
             if(user==null){
                 //新用户
-                String phoneNumber = phoneNoInfo.getPhoneNumber();
                 //查询手机号是否存在，如果存在，更新
                 FsUser checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
                 if (checkPhone==null){

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -184,17 +184,7 @@ public class CourseFsUserController extends AppBaseController {
         logger.error("zyp \n【h5看课中途报错】：{}", msg);
     }
 
-    /**
-     * 根据销售获取邀请码
-     *
-     * @return
-     */
-    @GetMapping("/getInviteCode")
-    @ApiOperation("根据销售获取邀请码")
-    public R getInviteCode(Long salesId) {
-        String inviteCode = companyUserService.getInviteCodeByCompanyUserId(salesId);
-        return R.ok().put("inviteCode", inviteCode);
-    }
+
 
 
     @PostMapping("/bindSales")