验证码登录添加app_create_time

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -349,7 +349,13 @@ public class FsUserCourseVideoController extends AppBaseController {
         if(batchSendCourseDTO.getIsUrgeCourse()==null){
             batchSendCourseDTO.setIsUrgeCourse(false);
         }
-        return openIMService.batchSendCourseLimit(batchSendCourseDTO);
+
+        // 异步调用
+        openIMService.batchSendCourseLimit(batchSendCourseDTO);
+        OpenImResponseDTO openImResponseDTO = new OpenImResponseDTO();
+        openImResponseDTO.setErrCode(0);
+        openImResponseDTO.setErrMsg("异步发送，详细请看明细");
+        return openImResponseDTO;
     }
 
     @ApiOperation("会员一键催课")

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -2449,7 +2449,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="selectFsUserListByPhone" resultType="com.fs.his.domain.FsUser">
-        select * from fs_user where phone=#{phone}
+        select * from fs_user where phone=#{phone} and is_del = 0 order by create_time
     </select>
     <!-- 查询用户列表（用于积分管理） -->
     <select id="selectFsUserListForIntegral" parameterType="FsUser" resultMap="FsUserResult">

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

@@ -498,18 +498,23 @@ public class AppLoginController extends AppBaseController{
             return R.error("验证码错误");
         }
 
-        updateExistingUserJpushId(user.get(0), map.get("jpushId"));
-        if (user.get(0).getUnionId()==null){
-            if (user.get(0).getPhone().length()<=11){
-                FsUser fsUser = new FsUser();
-                fsUser.setUserId(user.get(0).getUserId());
-                fsUser.setPhone(encryptPhone(phone));
-                userMapper.updateFsUser(fsUser);
-                logger.info("zyp \n【手机加密】：{}",encryptPhone(phone));
-            }
-            return R.ok(generateTokenAndReturn(user.get(0))).put("isNew",true).put("phone",encryptPhone(phone));
+        FsUser info=user.get(0);
+        FsUser userMap = new FsUser();
+        userMap.setUserId(info.getUserId());
+        String jpushId = map.get("jpushId");
+        if(StringUtils.isNotEmpty(jpushId)){
+            userMap.setJpushId(jpushId);
+        }
+        if(info.getAppCreateTime()== null){
+            userMap.setAppCreateTime(new Date());
         }
-        return generateTokenAndReturn(user.get(0));
+        if(info.getUnionId()==null && info.getPhone().length()<=11){
+            userMap.setPhone(encryptPhone(phone));
+        }
+        userMap.setUpdateTime(new Date());
+        userService.updateFsUser(userMap);
+
+        return generateTokenAndReturn(info);
     }
 
     @PostMapping("/resetPassword")