个代二维码注册逻辑调整

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -484,8 +484,10 @@ public class SysLoginController {
 
         ObjectMapper objectMapper = new ObjectMapper();
         String content = redisTemplate.opsForValue().get(uuid);
-        LoginTicket loginTicket = objectMapper.readValue(content, LoginTicket.class);
-
+        LoginTicket loginTicket = null;
+        if (StringUtils.isNotBlank(content)) {
+            loginTicket = objectMapper.readValue(content, LoginTicket.class);
+        }
         if (loginTicket == null) {
             resultMap.put("statusCode", QrCodeStatusEnum.INVALID);
             resultMap.put("status", QrCodeStatusEnum.INVALID.getStatusValue());

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -703,10 +703,10 @@ public class SysUserController extends BaseController {
         String password = PasswordUtils.encode(dto.getPassword(), salt);
         sysUser.setPassword(password);
         sysUser.setSalt(salt);
-        sysUser.setStatus(dto.getFlag().equals("1") ? 2 : 1);//1：正常   2：审批中
+        sysUser.setStatus("2".equals(dto.getFlag()) ? 2 : 1);//1：正常   2：审批中
         sysUser.setId(nextPK);
         sysUser.setCreateBy("admin");
-        if (dto.getFlag().equals("2")) {
+        if ("1".equals(dto.getFlag())) {
             sysUser.setOperatorCode(recommenderid);
         }
         sysUser.setFactorVerify(response != null && "00".equals(response.getRespCode())? 1:0);
@@ -715,7 +715,7 @@ public class SysUserController extends BaseController {
         //角色配置
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(nextPK);
-        userRole.setRoleId(dto.getFlag().equals("1") ? 20L : 19L);
+        userRole.setRoleId(dto.getFlag().equals("2") ? 20L : 19L);
         sysUserRoleService.save(userRole);
 
         //添加增员服务消息
@@ -723,7 +723,7 @@ public class SysUserController extends BaseController {
         messageSecretaryService.addMessage(MessageTypeConstants.M_6, dto.getReferrerId(),
                 dto.getMobile() + "(" + dto.getName() + ")" + "进行注册,请立即审核.");
 
-        if (dto.getFlag().equals("1")) {
+        if ("2".equals(dto.getFlag())) {
             esmUserReferrerService.addReferrer(dto.getReferrerId(), nextPK);
         }
         return HttpResult.ok("保存成功", sysUser.getId());

src/main/java/com/ydtech/modules/admin/model/dto/AgentUserDto.java

@@ -39,7 +39,7 @@ public class AgentUserDto {
     @ApiModelProperty(value = "推荐人名称",required = true)
     private String referrerName;
 
-    @ApiModelProperty(value = "个代、出单员标识:1个代、2出单员",required = true)
+    @ApiModelProperty(value = "个代、出单员标识:2个代、1出单员",required = true)
     private String flag;
 
 }