Quellcode durchsuchen

feat: "获取账户类型,判断是否是海外用户"

wangzeyu@tom.com vor 2 Jahren
Ursprung
Commit
2302654fd0

+ 29 - 7
src/main/java/com/szwl/controller/TAdminController.java

@@ -3,9 +3,6 @@ package com.szwl.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,21 +19,17 @@ import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.*;
 import com.szwl.model.param.AddLoginUserParam;
 import com.szwl.model.param.UpdateLoginUserParam;
-import com.szwl.model.param.UpdateSysRoleParam;
 import com.szwl.model.utils.AdminUtils;
 import com.szwl.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,6 +59,35 @@ public class TAdminController {
     @Autowired
     TMessageCodeService tMessageCodeService;
 
+
+    @ApiOperation(value = "获取账户类型")
+    @GetMapping("/getAdminType")
+    public ResponseModel<Integer> getAdminType(@RequestParam Long adminId) {
+        if (adminId != null) {
+            LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(TAdmin::getId, adminId);
+            TAdmin tAdmin = tAdminService.getOne(wrapper);
+            Integer type = tAdmin.getType();
+            return R.ok(type);
+        }
+        return R.fail("adminId无效");
+    }
+
+
+    @ApiOperation(value = "判断是否海外用户")
+    @GetMapping("/getIfForeign/{adminId}")
+    public ResponseModel<?> getIfForeign(@PathVariable Long adminId) {
+        if (adminId != null){
+            LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(TAdmin::getId, adminId);
+            TAdmin one = tAdminService.getOne(wrapper);
+            String ifForeign = one.getIfForeign();
+            return R.ok(ifForeign);
+        }
+        return R.fail("未登录");
+    }
+
+
     @ApiOperation(value = "添加子账号")
     @PostMapping("/addLoginUser")
     @Transactional

+ 3 - 3
src/main/java/com/szwl/model/query/TCoinOrderParam.java

@@ -25,9 +25,9 @@ import java.util.List;
 @Setter
 @ToString
 public class TCoinOrderParam extends TCoinOrder {
-	 @CamelCaseToUnderscore
-     @ApiModelProperty(value = "排序,如:id desc")
-     private String orderByClause;
+    @CamelCaseToUnderscore
+    @ApiModelProperty(value = "排序,如:id desc")
+    private String orderByClause;
     @ApiModelProperty(value = "是否distinct")
     private boolean distinct;
     @ApiModelProperty(value = "分页,展示多少条记录")

+ 3 - 3
src/main/java/com/szwl/model/query/TOrderParam.java

@@ -25,9 +25,9 @@ import java.util.List;
 @Setter
 @ToString
 public class TOrderParam extends TOrder {
-	 @CamelCaseToUnderscore
-     @ApiModelProperty(value = "排序,如:id desc")
-     private String orderByClause;
+	@CamelCaseToUnderscore
+	@ApiModelProperty(value = "排序,如:id desc")
+	private String orderByClause;
     @ApiModelProperty(value = "是否distinct")
     private boolean distinct;
     @ApiModelProperty(value = "分页,展示多少条记录")