修改登录和 注销

alien-gateway/src/main/java/shop/alien/gateway/controller/StoreUserController.java

@@ -69,10 +69,10 @@ public class StoreUserController {
         if (storeUser.getStatus() == 1) {
             return R.fail("账号被禁用");
         }
-        if (storeUser.getLogoutFlag() != null && StoreUser.LOGOUT_FLAG_DONE == storeUser.getLogoutFlag()
-                && !Integer.valueOf(-1).equals(storeUser.getStatus())) {
-            return R.fail("账号已注销");
-        }
+//        if (storeUser.getLogoutFlag() != null && StoreUser.LOGOUT_FLAG_DONE == storeUser.getLogoutFlag()
+//                && !Integer.valueOf(-1).equals(storeUser.getStatus())) {
+//            return R.fail("账号已注销");
+//        }
         return Optional.ofNullable(storeUser).
                 map(user -> isPassword ? checkPassword(user, password) : storeUserService.createToKen(user)).
                 orElseGet(() -> R.fail("手机号不存在"));

alien-store/src/main/java/shop/alien/store/controller/StoreUserController.java

@@ -365,7 +365,7 @@ public class StoreUserController {
     @ApiOperationSupport(order = 9)
     @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})
     @GetMapping("/checkLogin")
-    public R<Boolean> checkLogin(String phone) {
+    public R<StoreUser> checkLogin(String phone) {
         log.info("StoreUserController.checkLogin?phone={}", phone);
         return storeUserService.checkLogin(phone);
     }

alien-store/src/main/java/shop/alien/store/service/StoreUserService.java

@@ -148,7 +148,7 @@ public interface StoreUserService extends IService<StoreUser> {
      * @param phone
      * @return
      */
-    public R<Boolean> checkLogin(String phone);
+    public R<StoreUser> checkLogin(String phone);
 
     /***
      * 商户端注册

alien-store/src/main/java/shop/alien/store/service/impl/StoreUserServiceImpl.java

@@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.netease.yidun.sdk.anticheat.v3.AnticheatCheckRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Triple;
@@ -43,7 +41,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -1036,7 +1033,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
      * @return
      */
     @Override
-    public R<Boolean> checkLogin(String phone) {
+    public R<StoreUser> checkLogin(String phone) {
         LambdaQueryWrapper<StoreUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StoreUser::getPhone, phone)
                 .orderByDesc(StoreUser::getCreatedTime).last("LIMIT 1");
@@ -1047,11 +1044,11 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         } else if (storeUser.getStatus() != null && storeUser.getStatus() == 1) {
             return R.success("账号已被禁用");
         } else if (isStoreUserLoggedOut(storeUser)) {
-            return R.success("账号已注销");
+            return R.data(storeUser,"账号已注销");
         } else if (isStoreUserLogoutCooling(storeUser)) {
-            return R.success("账号注销冷静期中");
+            return R.data(storeUser,"账号注销冷静期中");
         }
-        return R.success("success");
+        return R.data(storeUser,"success");
     }