Browse Source

Merge branch 'master' of https://git.yishihui.com/Server/risk-control

刘立冬 1 month ago
parent
commit
6d2839e520
28 changed files with 1460 additions and 2041 deletions
  1. 3 3
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/AuthInterceptor.java
  2. 2 2
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/CrossOriginConfig.java
  3. 1 1
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/LoginUserContext.java
  4. 11 11
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserBaseMapper.java
  5. 0 96
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserCorpMapper.java
  6. 11 11
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserMapper.java
  7. 76 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/plugin/PaginationPlugin.java
  8. 77 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/Page.java
  9. 0 26
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/PageDTO.java
  10. 18 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/WorkWechatUserInfo.java
  11. 7 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/param/LoginAndRegisterParam.java
  12. 22 22
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/User.java
  13. 316 28
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserBase.java
  14. 576 17
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserBaseExample.java
  15. 0 384
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserCorp.java
  16. 0 953
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserCorpExample.java
  17. 46 17
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserExample.java
  18. 8 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/WorkWechatService.java
  19. 36 9
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/QwLoginServiceImpl.java
  20. 6 52
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/QywxUserDataService.java
  21. 1 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/UserServiceImpl.java
  22. 40 0
      risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/WorkWechatServiceImpl.java
  23. 150 22
      risk-control-core/src/main/resources/mapper/UserBaseMapper.xml
  24. 0 366
      risk-control-core/src/main/resources/mapper/UserCorpMapper.xml
  25. 18 15
      risk-control-core/src/main/resources/mapper/UserMapper.xml
  26. 4 2
      risk-control-core/src/main/resources/mybatis-generator-config.xml
  27. 3 4
      risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/UserController.java
  28. 28 0
      risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/WorkWechatController.java

+ 3 - 3
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/JwtInterceptor.java → risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/AuthInterceptor.java

@@ -25,9 +25,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 @Component
-public class JwtInterceptor implements HandlerInterceptor {
+public class AuthInterceptor implements HandlerInterceptor {
 
-    private final static Logger log = LoggerFactory.getLogger(JwtInterceptor.class);
+    private final static Logger log = LoggerFactory.getLogger(AuthInterceptor.class);
 
     ThreadPoolExecutor executor = new ThreadPoolExecutor(128, 128,
             0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(100000), new ThreadFactoryBuilder().setNameFormat("ad-platform-login-service-pool-%d").build(), new ThreadPoolExecutor.AbortPolicy());
@@ -60,7 +60,7 @@ public class JwtInterceptor implements HandlerInterceptor {
 
         if (StringUtils.isBlank(token)) {
             log.info("LOGIN_ERROR, authHeader:{}", token);
-            throw new CommonException(ExceptionEnum.LOGIN_ERROR, "登录失效,请重新登录。");
+            throw new CommonException(ExceptionEnum.LOGIN_ERROR, "未登录,请先登录!!!");
         }
 
         this.validToken(token);

+ 2 - 2
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/CrossOriginConfig.java

@@ -9,10 +9,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class CrossOriginConfig implements WebMvcConfigurer {
 
-    private final JwtInterceptor jwtInterceptor;
+    private final AuthInterceptor jwtInterceptor;
 
     @Autowired
-    public CrossOriginConfig(JwtInterceptor jwtInterceptor) {
+    public CrossOriginConfig(AuthInterceptor jwtInterceptor) {
         this.jwtInterceptor = jwtInterceptor;
     }
 

+ 1 - 1
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/config/LoginUserContext.java

@@ -20,7 +20,7 @@ public class LoginUserContext {
         return USER_THREAD_LOCAL.get().orElseThrow(() -> new CommonException(ExceptionEnum.LOGIN_ERROR));
     }
 
-    private static Long getUserId() {
+    public static Long getUserId() {
         return USER_THREAD_LOCAL.get().map(User::getId).orElseThrow(() -> new CommonException(ExceptionEnum.LOGIN_ERROR));
     }
 

+ 11 - 11
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserBaseMapper.java

@@ -10,7 +10,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     long countByExample(UserBaseExample example);
 
@@ -18,7 +18,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int deleteByExample(UserBaseExample example);
 
@@ -26,7 +26,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int deleteByPrimaryKey(Long id);
 
@@ -34,7 +34,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int insert(UserBase record);
 
@@ -42,7 +42,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int insertSelective(UserBase record);
 
@@ -50,7 +50,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     List<UserBase> selectByExample(UserBaseExample example);
 
@@ -58,7 +58,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     UserBase selectByPrimaryKey(Long id);
 
@@ -66,7 +66,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int updateByExampleSelective(@Param("record") UserBase record, @Param("example") UserBaseExample example);
 
@@ -74,7 +74,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int updateByExample(@Param("record") UserBase record, @Param("example") UserBaseExample example);
 
@@ -82,7 +82,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int updateByPrimaryKeySelective(UserBase record);
 
@@ -90,7 +90,7 @@ public interface UserBaseMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     int updateByPrimaryKey(UserBase record);
 }

+ 0 - 96
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserCorpMapper.java

@@ -1,96 +0,0 @@
-package com.tzld.piaoquan.risk.control.dao.mapper;
-
-import com.tzld.piaoquan.risk.control.model.po.UserCorp;
-import com.tzld.piaoquan.risk.control.model.po.UserCorpExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface UserCorpMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    long countByExample(UserCorpExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int deleteByExample(UserCorpExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int insert(UserCorp record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int insertSelective(UserCorp record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    List<UserCorp> selectByExample(UserCorpExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    UserCorp selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int updateByExampleSelective(@Param("record") UserCorp record, @Param("example") UserCorpExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int updateByExample(@Param("record") UserCorp record, @Param("example") UserCorpExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int updateByPrimaryKeySelective(UserCorp record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    int updateByPrimaryKey(UserCorp record);
-}

+ 11 - 11
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/mapper/UserMapper.java

@@ -10,7 +10,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     long countByExample(UserExample example);
 
@@ -18,7 +18,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int deleteByExample(UserExample example);
 
@@ -26,7 +26,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int deleteByPrimaryKey(Long id);
 
@@ -34,7 +34,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int insert(User record);
 
@@ -42,7 +42,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int insertSelective(User record);
 
@@ -50,7 +50,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     List<User> selectByExample(UserExample example);
 
@@ -58,7 +58,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     User selectByPrimaryKey(Long id);
 
@@ -66,7 +66,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
@@ -74,7 +74,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
@@ -82,7 +82,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int updateByPrimaryKeySelective(User record);
 
@@ -90,7 +90,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     int updateByPrimaryKey(User record);
 }

+ 76 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/dao/plugin/PaginationPlugin.java

@@ -0,0 +1,76 @@
+package com.tzld.piaoquan.risk.control.dao.plugin;
+
+import org.mybatis.generator.api.CommentGenerator;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.PluginAdapter;
+import org.mybatis.generator.api.dom.java.*;
+import org.mybatis.generator.api.dom.xml.Attribute;
+import org.mybatis.generator.api.dom.xml.TextElement;
+import org.mybatis.generator.api.dom.xml.XmlElement;
+
+import java.util.List;
+
+public class PaginationPlugin extends PluginAdapter {
+
+    @Override
+    public boolean modelExampleClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
+        addPage(topLevelClass, introspectedTable, "page");
+        return super.modelExampleClassGenerated(topLevelClass, introspectedTable);
+    }
+
+    @Override
+    public boolean sqlMapSelectByExampleWithoutBLOBsElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
+        XmlElement page = new XmlElement("if");
+        page.addAttribute(new Attribute("test", "page != null"));
+        page.addElement(new TextElement("limit #{page.offset} , #{page.pageSize}"));
+        element.addElement(page);
+        return super.sqlMapUpdateByExampleWithoutBLOBsElementGenerated(element, introspectedTable);
+    }
+
+    @Override
+    public boolean sqlMapSelectByExampleWithBLOBsElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
+        XmlElement page = new XmlElement("if");
+        page.addAttribute(new Attribute("test", "page != null"));
+        page.addElement(new TextElement("limit #{page.offset} , #{page.pageSize}"));
+        element.addElement(page);
+        return super.sqlMapSelectByExampleWithBLOBsElementGenerated(element, introspectedTable);
+    }
+
+    /**
+     * @param topLevelClass
+     * @param introspectedTable
+     * @param name
+     */
+    private void addPage(TopLevelClass topLevelClass, IntrospectedTable introspectedTable, String name) {
+        topLevelClass.addImportedType(new FullyQualifiedJavaType("com.tzld.piaoquan.risk.control.model.dto.Page"));
+        CommentGenerator commentGenerator = context.getCommentGenerator();
+        Field field = new Field();
+        field.setVisibility(JavaVisibility.PROTECTED);
+        field.setType(new FullyQualifiedJavaType("com.tzld.piaoquan.risk.control.model.dto.Page"));
+        field.setName(name);
+        commentGenerator.addFieldComment(field, introspectedTable);
+        topLevelClass.addField(field);
+        char c = name.charAt(0);
+        String camel = Character.toUpperCase(c) + name.substring(1);
+        Method method = new Method();
+        method.setVisibility(JavaVisibility.PUBLIC);
+        method.setName("set" + camel);
+        method.addParameter(new Parameter(new FullyQualifiedJavaType("com.tzld.piaoquan.risk.control.model.dto.Page"), name));
+        method.addBodyLine("this." + name + "=" + name + ";");
+        commentGenerator.addGeneralMethodComment(method, introspectedTable);
+        topLevelClass.addMethod(method);
+        method = new Method();
+        method.setVisibility(JavaVisibility.PUBLIC);
+        method.setReturnType(new FullyQualifiedJavaType("com.tzld.piaoquan.risk.control.model.dto.Page"));
+        method.setName("get" + camel);
+        method.addBodyLine("return " + name + ";");
+        commentGenerator.addGeneralMethodComment(method, introspectedTable);
+        topLevelClass.addMethod(method);
+    }
+
+    @Override
+    public boolean validate(List<String> arg0) {
+        return true;
+    }
+
+}

+ 77 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/Page.java

@@ -0,0 +1,77 @@
+package com.tzld.piaoquan.risk.control.model.dto;
+
+import lombok.Data;
+import lombok.Setter;
+
+import java.util.List;
+
+@Data
+public class Page<T> {
+
+    private int currentPage = 1;
+    private int totalSize;
+    private int pageSize = 20;
+
+    @Setter
+    private List<T> objs;
+
+    public Page() {
+    }
+
+    public Page(int currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Page(int currentPage, int pageSize) {
+        setCurrentPage(currentPage);
+        setPageSize(pageSize);
+    }
+
+    public int getNextPage() {
+        return currentPage == getTotalPage() ? currentPage : currentPage + 1;
+    }
+
+    public int getPrePage() {
+        return currentPage > 1 ? currentPage - 1 : 1;
+    }
+
+    public int getOffset() {
+        return getCurPageFirstRecNum() - 1;
+    }
+
+    public int getCurPageFirstRecNum() {
+        return (getCurrentPage() - 1) * pageSize + 1;
+    }
+
+    public int getCurPageLastRecNum() {
+        return getCurrentPage() * pageSize;
+    }
+
+    public int getTotalPage() {
+        int t = totalSize % pageSize > 0 ? totalSize / pageSize + 1 : totalSize / pageSize;
+        if (t <= 0) {
+            t = 1;
+        }
+        return t;
+    }
+
+    public void setPageSize(int pageSize) {
+        if (pageSize > 0) {
+            this.pageSize = pageSize;
+        }
+    }
+
+    public boolean containData() {
+        return getTotalSize() > 0;
+    }
+
+    @Override
+    public String toString() {
+        return "Page{" +
+                "currentPage=" + currentPage +
+                ", totalSize=" + totalSize +
+                ", pageSize=" + pageSize +
+                ", objs=" + objs +
+                '}';
+    }
+}

+ 0 - 26
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/PageDTO.java

@@ -1,26 +0,0 @@
-package com.tzld.piaoquan.risk.control.model.dto;
-
-/**
- * @author supeng
- */
-public class PageDTO {
-
-    private int pageNum;
-    private int pageSize;
-
-    public int getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(int pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public int getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-}

+ 18 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/WorkWechatUserInfo.java

@@ -0,0 +1,18 @@
+package com.tzld.piaoquan.risk.control.model.dto;
+
+import lombok.Data;
+
+@Data
+public class WorkWechatUserInfo {
+
+    private Long id;
+
+    private String name;
+
+    private String phone;
+
+    private String corpName;
+
+    private String loginStatus;
+
+}

+ 7 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/param/LoginAndRegisterParam.java

@@ -11,4 +11,11 @@ public class LoginAndRegisterParam {
 
     private String password;
 
+    @Override
+    public String toString() {
+        return "LoginAndRegisterParam{" +
+                "account='" + account + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
 }

+ 22 - 22
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/User.java

@@ -15,7 +15,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.id
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private Long id;
 
@@ -26,7 +26,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.phone
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private String phone;
 
@@ -37,7 +37,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.email
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private String email;
 
@@ -48,7 +48,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.name
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private String name;
 
@@ -59,7 +59,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.password
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private String password;
 
@@ -70,7 +70,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.create_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private Date createTime;
 
@@ -81,7 +81,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column user.update_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     private Date updateTime;
 
@@ -91,7 +91,7 @@ public class User {
      *
      * @return the value of user.id
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public Long getId() {
         return id;
@@ -103,7 +103,7 @@ public class User {
      *
      * @param id the value for user.id
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setId(Long id) {
         this.id = id;
@@ -115,7 +115,7 @@ public class User {
      *
      * @return the value of user.phone
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public String getPhone() {
         return phone;
@@ -127,7 +127,7 @@ public class User {
      *
      * @param phone the value for user.phone
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setPhone(String phone) {
         this.phone = phone;
@@ -139,7 +139,7 @@ public class User {
      *
      * @return the value of user.email
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public String getEmail() {
         return email;
@@ -151,7 +151,7 @@ public class User {
      *
      * @param email the value for user.email
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setEmail(String email) {
         this.email = email;
@@ -163,7 +163,7 @@ public class User {
      *
      * @return the value of user.name
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public String getName() {
         return name;
@@ -175,7 +175,7 @@ public class User {
      *
      * @param name the value for user.name
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setName(String name) {
         this.name = name;
@@ -187,7 +187,7 @@ public class User {
      *
      * @return the value of user.password
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public String getPassword() {
         return password;
@@ -199,7 +199,7 @@ public class User {
      *
      * @param password the value for user.password
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setPassword(String password) {
         this.password = password;
@@ -211,7 +211,7 @@ public class User {
      *
      * @return the value of user.create_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public Date getCreateTime() {
         return createTime;
@@ -223,7 +223,7 @@ public class User {
      *
      * @param createTime the value for user.create_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
@@ -235,7 +235,7 @@ public class User {
      *
      * @return the value of user.update_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public Date getUpdateTime() {
         return updateTime;
@@ -247,7 +247,7 @@ public class User {
      *
      * @param updateTime the value for user.update_time
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
@@ -257,7 +257,7 @@ public class User {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     @Override
     public String toString() {

+ 316 - 28
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserBase.java

@@ -13,7 +13,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.id
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private Long id;
 
@@ -24,7 +24,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.uuid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private String uuid;
 
@@ -35,7 +35,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.vid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private String vid;
 
@@ -46,7 +46,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.mobile
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private String mobile;
 
@@ -57,10 +57,21 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.realname
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private String realname;
 
+    /**
+     * Database Column Remarks:
+     *   英文名
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.english_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private String englishName;
+
     /**
      * Database Column Remarks:
      *   头像URL
@@ -68,7 +79,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.avatar
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private String avatar;
 
@@ -79,10 +90,87 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.login_status
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private Integer loginStatus;
 
+    /**
+     * Database Column Remarks:
+     *   企业ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.corp_id
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private Long corpId;
+
+    /**
+     * Database Column Remarks:
+     *   企业名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.corp_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private String corpName;
+
+    /**
+     * Database Column Remarks:
+     *   在该企业的unionid
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.unionid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private String unionid;
+
+    /**
+     * Database Column Remarks:
+     *   在该企业的账号ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.acctid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private String acctid;
+
+    /**
+     * Database Column Remarks:
+     *   职位
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.position
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private String position;
+
+    /**
+     * Database Column Remarks:
+     *   创建人
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.create_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private Long createUser;
+
+    /**
+     * Database Column Remarks:
+     *   更新人
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column qywx_user_base.update_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    private Long updateUser;
+
     /**
      * Database Column Remarks:
      *   创建时间
@@ -90,7 +178,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.create_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private Date createTime;
 
@@ -101,7 +189,7 @@ public class UserBase {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column qywx_user_base.update_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     private Date updateTime;
 
@@ -111,7 +199,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.id
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Long getId() {
         return id;
@@ -123,7 +211,7 @@ public class UserBase {
      *
      * @param id the value for qywx_user_base.id
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setId(Long id) {
         this.id = id;
@@ -135,7 +223,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.uuid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getUuid() {
         return uuid;
@@ -147,7 +235,7 @@ public class UserBase {
      *
      * @param uuid the value for qywx_user_base.uuid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setUuid(String uuid) {
         this.uuid = uuid;
@@ -159,7 +247,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.vid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getVid() {
         return vid;
@@ -171,7 +259,7 @@ public class UserBase {
      *
      * @param vid the value for qywx_user_base.vid
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setVid(String vid) {
         this.vid = vid;
@@ -183,7 +271,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.mobile
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getMobile() {
         return mobile;
@@ -195,7 +283,7 @@ public class UserBase {
      *
      * @param mobile the value for qywx_user_base.mobile
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setMobile(String mobile) {
         this.mobile = mobile;
@@ -207,7 +295,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.realname
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getRealname() {
         return realname;
@@ -219,19 +307,43 @@ public class UserBase {
      *
      * @param realname the value for qywx_user_base.realname
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setRealname(String realname) {
         this.realname = realname;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.english_name
+     *
+     * @return the value of qywx_user_base.english_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.english_name
+     *
+     * @param englishName the value for qywx_user_base.english_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column qywx_user_base.avatar
      *
      * @return the value of qywx_user_base.avatar
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getAvatar() {
         return avatar;
@@ -243,7 +355,7 @@ public class UserBase {
      *
      * @param avatar the value for qywx_user_base.avatar
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setAvatar(String avatar) {
         this.avatar = avatar;
@@ -255,7 +367,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.login_status
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Integer getLoginStatus() {
         return loginStatus;
@@ -267,19 +379,187 @@ public class UserBase {
      *
      * @param loginStatus the value for qywx_user_base.login_status
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setLoginStatus(Integer loginStatus) {
         this.loginStatus = loginStatus;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.corp_id
+     *
+     * @return the value of qywx_user_base.corp_id
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public Long getCorpId() {
+        return corpId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.corp_id
+     *
+     * @param corpId the value for qywx_user_base.corp_id
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setCorpId(Long corpId) {
+        this.corpId = corpId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.corp_name
+     *
+     * @return the value of qywx_user_base.corp_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public String getCorpName() {
+        return corpName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.corp_name
+     *
+     * @param corpName the value for qywx_user_base.corp_name
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.unionid
+     *
+     * @return the value of qywx_user_base.unionid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public String getUnionid() {
+        return unionid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.unionid
+     *
+     * @param unionid the value for qywx_user_base.unionid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.acctid
+     *
+     * @return the value of qywx_user_base.acctid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public String getAcctid() {
+        return acctid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.acctid
+     *
+     * @param acctid the value for qywx_user_base.acctid
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setAcctid(String acctid) {
+        this.acctid = acctid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.position
+     *
+     * @return the value of qywx_user_base.position
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.position
+     *
+     * @param position the value for qywx_user_base.position
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.create_user
+     *
+     * @return the value of qywx_user_base.create_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.create_user
+     *
+     * @param createUser the value for qywx_user_base.create_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column qywx_user_base.update_user
+     *
+     * @return the value of qywx_user_base.update_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public Long getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column qywx_user_base.update_user
+     *
+     * @param updateUser the value for qywx_user_base.update_user
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setUpdateUser(Long updateUser) {
+        this.updateUser = updateUser;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column qywx_user_base.create_time
      *
      * @return the value of qywx_user_base.create_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Date getCreateTime() {
         return createTime;
@@ -291,7 +571,7 @@ public class UserBase {
      *
      * @param createTime the value for qywx_user_base.create_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
@@ -303,7 +583,7 @@ public class UserBase {
      *
      * @return the value of qywx_user_base.update_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Date getUpdateTime() {
         return updateTime;
@@ -315,7 +595,7 @@ public class UserBase {
      *
      * @param updateTime the value for qywx_user_base.update_time
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
@@ -325,7 +605,7 @@ public class UserBase {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     @Override
     public String toString() {
@@ -338,8 +618,16 @@ public class UserBase {
         sb.append(", vid=").append(vid);
         sb.append(", mobile=").append(mobile);
         sb.append(", realname=").append(realname);
+        sb.append(", englishName=").append(englishName);
         sb.append(", avatar=").append(avatar);
         sb.append(", loginStatus=").append(loginStatus);
+        sb.append(", corpId=").append(corpId);
+        sb.append(", corpName=").append(corpName);
+        sb.append(", unionid=").append(unionid);
+        sb.append(", acctid=").append(acctid);
+        sb.append(", position=").append(position);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", updateUser=").append(updateUser);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

+ 576 - 17
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserBaseExample.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.risk.control.model.po;
 
+import com.tzld.piaoquan.risk.control.model.dto.Page;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -9,7 +10,7 @@ public class UserBaseExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     protected String orderByClause;
 
@@ -17,7 +18,7 @@ public class UserBaseExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     protected boolean distinct;
 
@@ -25,15 +26,23 @@ public class UserBaseExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     protected List<Criteria> oredCriteria;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table qywx_user_base
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    protected Page page;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public UserBaseExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +52,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +62,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +72,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +82,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +92,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +102,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +112,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +124,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +138,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +149,7 @@ public class UserBaseExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public void clear() {
         oredCriteria.clear();
@@ -148,11 +157,31 @@ public class UserBaseExample {
         distinct = false;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table qywx_user_base
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table qywx_user_base
+     *
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
+     */
+    public Page getPage() {
+        return page;
+    }
+
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -535,6 +564,76 @@ public class UserBaseExample {
             return (Criteria) this;
         }
 
+        public Criteria andEnglishNameIsNull() {
+            addCriterion("english_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameIsNotNull() {
+            addCriterion("english_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameEqualTo(String value) {
+            addCriterion("english_name =", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameNotEqualTo(String value) {
+            addCriterion("english_name <>", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameGreaterThan(String value) {
+            addCriterion("english_name >", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameGreaterThanOrEqualTo(String value) {
+            addCriterion("english_name >=", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameLessThan(String value) {
+            addCriterion("english_name <", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameLessThanOrEqualTo(String value) {
+            addCriterion("english_name <=", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameLike(String value) {
+            addCriterion("english_name like", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameNotLike(String value) {
+            addCriterion("english_name not like", value, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameIn(List<String> values) {
+            addCriterion("english_name in", values, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameNotIn(List<String> values) {
+            addCriterion("english_name not in", values, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameBetween(String value1, String value2) {
+            addCriterion("english_name between", value1, value2, "englishName");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnglishNameNotBetween(String value1, String value2) {
+            addCriterion("english_name not between", value1, value2, "englishName");
+            return (Criteria) this;
+        }
+
         public Criteria andAvatarIsNull() {
             addCriterion("avatar is null");
             return (Criteria) this;
@@ -665,6 +764,466 @@ public class UserBaseExample {
             return (Criteria) this;
         }
 
+        public Criteria andCorpIdIsNull() {
+            addCriterion("corp_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdIsNotNull() {
+            addCriterion("corp_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdEqualTo(Long value) {
+            addCriterion("corp_id =", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdNotEqualTo(Long value) {
+            addCriterion("corp_id <>", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdGreaterThan(Long value) {
+            addCriterion("corp_id >", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("corp_id >=", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdLessThan(Long value) {
+            addCriterion("corp_id <", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdLessThanOrEqualTo(Long value) {
+            addCriterion("corp_id <=", value, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdIn(List<Long> values) {
+            addCriterion("corp_id in", values, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdNotIn(List<Long> values) {
+            addCriterion("corp_id not in", values, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdBetween(Long value1, Long value2) {
+            addCriterion("corp_id between", value1, value2, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpIdNotBetween(Long value1, Long value2) {
+            addCriterion("corp_id not between", value1, value2, "corpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameIsNull() {
+            addCriterion("corp_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameIsNotNull() {
+            addCriterion("corp_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameEqualTo(String value) {
+            addCriterion("corp_name =", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameNotEqualTo(String value) {
+            addCriterion("corp_name <>", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameGreaterThan(String value) {
+            addCriterion("corp_name >", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameGreaterThanOrEqualTo(String value) {
+            addCriterion("corp_name >=", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameLessThan(String value) {
+            addCriterion("corp_name <", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameLessThanOrEqualTo(String value) {
+            addCriterion("corp_name <=", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameLike(String value) {
+            addCriterion("corp_name like", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameNotLike(String value) {
+            addCriterion("corp_name not like", value, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameIn(List<String> values) {
+            addCriterion("corp_name in", values, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameNotIn(List<String> values) {
+            addCriterion("corp_name not in", values, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameBetween(String value1, String value2) {
+            addCriterion("corp_name between", value1, value2, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCorpNameNotBetween(String value1, String value2) {
+            addCriterion("corp_name not between", value1, value2, "corpName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidIsNull() {
+            addCriterion("unionid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidIsNotNull() {
+            addCriterion("unionid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidEqualTo(String value) {
+            addCriterion("unionid =", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidNotEqualTo(String value) {
+            addCriterion("unionid <>", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidGreaterThan(String value) {
+            addCriterion("unionid >", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidGreaterThanOrEqualTo(String value) {
+            addCriterion("unionid >=", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidLessThan(String value) {
+            addCriterion("unionid <", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidLessThanOrEqualTo(String value) {
+            addCriterion("unionid <=", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidLike(String value) {
+            addCriterion("unionid like", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidNotLike(String value) {
+            addCriterion("unionid not like", value, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidIn(List<String> values) {
+            addCriterion("unionid in", values, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidNotIn(List<String> values) {
+            addCriterion("unionid not in", values, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidBetween(String value1, String value2) {
+            addCriterion("unionid between", value1, value2, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnionidNotBetween(String value1, String value2) {
+            addCriterion("unionid not between", value1, value2, "unionid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidIsNull() {
+            addCriterion("acctid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidIsNotNull() {
+            addCriterion("acctid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidEqualTo(String value) {
+            addCriterion("acctid =", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidNotEqualTo(String value) {
+            addCriterion("acctid <>", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidGreaterThan(String value) {
+            addCriterion("acctid >", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidGreaterThanOrEqualTo(String value) {
+            addCriterion("acctid >=", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidLessThan(String value) {
+            addCriterion("acctid <", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidLessThanOrEqualTo(String value) {
+            addCriterion("acctid <=", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidLike(String value) {
+            addCriterion("acctid like", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidNotLike(String value) {
+            addCriterion("acctid not like", value, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidIn(List<String> values) {
+            addCriterion("acctid in", values, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidNotIn(List<String> values) {
+            addCriterion("acctid not in", values, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidBetween(String value1, String value2) {
+            addCriterion("acctid between", value1, value2, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctidNotBetween(String value1, String value2) {
+            addCriterion("acctid not between", value1, value2, "acctid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIsNull() {
+            addCriterion("`position` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIsNotNull() {
+            addCriterion("`position` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionEqualTo(String value) {
+            addCriterion("`position` =", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotEqualTo(String value) {
+            addCriterion("`position` <>", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionGreaterThan(String value) {
+            addCriterion("`position` >", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionGreaterThanOrEqualTo(String value) {
+            addCriterion("`position` >=", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionLessThan(String value) {
+            addCriterion("`position` <", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionLessThanOrEqualTo(String value) {
+            addCriterion("`position` <=", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionLike(String value) {
+            addCriterion("`position` like", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotLike(String value) {
+            addCriterion("`position` not like", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIn(List<String> values) {
+            addCriterion("`position` in", values, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotIn(List<String> values) {
+            addCriterion("`position` not in", values, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionBetween(String value1, String value2) {
+            addCriterion("`position` between", value1, value2, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotBetween(String value1, String value2) {
+            addCriterion("`position` not between", value1, value2, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("create_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("create_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(Long value) {
+            addCriterion("create_user =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(Long value) {
+            addCriterion("create_user <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(Long value) {
+            addCriterion("create_user >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_user >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(Long value) {
+            addCriterion("create_user <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(Long value) {
+            addCriterion("create_user <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<Long> values) {
+            addCriterion("create_user in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<Long> values) {
+            addCriterion("create_user not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(Long value1, Long value2) {
+            addCriterion("create_user between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(Long value1, Long value2) {
+            addCriterion("create_user not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("update_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("update_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(Long value) {
+            addCriterion("update_user =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(Long value) {
+            addCriterion("update_user <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(Long value) {
+            addCriterion("update_user >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_user >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(Long value) {
+            addCriterion("update_user <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(Long value) {
+            addCriterion("update_user <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<Long> values) {
+            addCriterion("update_user in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<Long> values) {
+            addCriterion("update_user not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(Long value1, Long value2) {
+            addCriterion("update_user between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(Long value1, Long value2) {
+            addCriterion("update_user not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -790,7 +1349,7 @@ public class UserBaseExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table qywx_user_base
      *
-     * @mbg.generated do_not_delete_during_merge Wed May 14 16:14:51 CST 2025
+     * @mbg.generated do_not_delete_during_merge Thu May 22 20:07:47 CST 2025
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -803,7 +1362,7 @@ public class UserBaseExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table qywx_user_base
      *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
+     * @mbg.generated Thu May 22 20:07:47 CST 2025
      */
     public static class Criterion {
         private String condition;

+ 0 - 384
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserCorp.java

@@ -1,384 +0,0 @@
-package com.tzld.piaoquan.risk.control.model.po;
-
-import java.util.Date;
-
-/**
- *
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table qywx_user_corp
- */
-public class UserCorp {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private Long id;
-
-    /**
-     * Database Column Remarks:
-     *   关联用户ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.user_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private Long userId;
-
-    /**
-     * Database Column Remarks:
-     *   企业ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.corp_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private Long corpId;
-
-    /**
-     * Database Column Remarks:
-     *   在该企业的unionid
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.unionid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private String unionid;
-
-    /**
-     * Database Column Remarks:
-     *   在该企业的账号ID
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.acctid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private String acctid;
-
-    /**
-     * Database Column Remarks:
-     *   职位
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.position
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private String position;
-
-    /**
-     * Database Column Remarks:
-     *   英文名
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.english_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private String englishName;
-
-    /**
-     * Database Column Remarks:
-     *   企业名称
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.corp_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private String corpName;
-
-    /**
-     * Database Column Remarks:
-     *   登录状态(0-未登录 1-已登录)
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.login_status
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private Boolean loginStatus;
-
-    /**
-     * Database Column Remarks:
-     *   更新时间
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column qywx_user_corp.update_time
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    private Date updateTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.id
-     *
-     * @return the value of qywx_user_corp.id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.id
-     *
-     * @param id the value for qywx_user_corp.id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.user_id
-     *
-     * @return the value of qywx_user_corp.user_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Long getUserId() {
-        return userId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.user_id
-     *
-     * @param userId the value for qywx_user_corp.user_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.corp_id
-     *
-     * @return the value of qywx_user_corp.corp_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Long getCorpId() {
-        return corpId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.corp_id
-     *
-     * @param corpId the value for qywx_user_corp.corp_id
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setCorpId(Long corpId) {
-        this.corpId = corpId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.unionid
-     *
-     * @return the value of qywx_user_corp.unionid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getUnionid() {
-        return unionid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.unionid
-     *
-     * @param unionid the value for qywx_user_corp.unionid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setUnionid(String unionid) {
-        this.unionid = unionid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.acctid
-     *
-     * @return the value of qywx_user_corp.acctid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getAcctid() {
-        return acctid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.acctid
-     *
-     * @param acctid the value for qywx_user_corp.acctid
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setAcctid(String acctid) {
-        this.acctid = acctid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.position
-     *
-     * @return the value of qywx_user_corp.position
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getPosition() {
-        return position;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.position
-     *
-     * @param position the value for qywx_user_corp.position
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.english_name
-     *
-     * @return the value of qywx_user_corp.english_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getEnglishName() {
-        return englishName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.english_name
-     *
-     * @param englishName the value for qywx_user_corp.english_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.corp_name
-     *
-     * @return the value of qywx_user_corp.corp_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getCorpName() {
-        return corpName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.corp_name
-     *
-     * @param corpName the value for qywx_user_corp.corp_name
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setCorpName(String corpName) {
-        this.corpName = corpName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.login_status
-     *
-     * @return the value of qywx_user_corp.login_status
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Boolean getLoginStatus() {
-        return loginStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.login_status
-     *
-     * @param loginStatus the value for qywx_user_corp.login_status
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setLoginStatus(Boolean loginStatus) {
-        this.loginStatus = loginStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column qywx_user_corp.update_time
-     *
-     * @return the value of qywx_user_corp.update_time
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column qywx_user_corp.update_time
-     *
-     * @param updateTime the value for qywx_user_corp.update_time
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", userId=").append(userId);
-        sb.append(", corpId=").append(corpId);
-        sb.append(", unionid=").append(unionid);
-        sb.append(", acctid=").append(acctid);
-        sb.append(", position=").append(position);
-        sb.append(", englishName=").append(englishName);
-        sb.append(", corpName=").append(corpName);
-        sb.append(", loginStatus=").append(loginStatus);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append("]");
-        return sb.toString();
-    }
-}

+ 0 - 953
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserCorpExample.java

@@ -1,953 +0,0 @@
-package com.tzld.piaoquan.risk.control.model.po;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class UserCorpExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public UserCorpExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Long value) {
-            addCriterion("id =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("id <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Long value) {
-            addCriterion("id >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("id >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Long value) {
-            addCriterion("id <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("id <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Long> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("id not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("id between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("id not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIsNull() {
-            addCriterion("user_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIsNotNull() {
-            addCriterion("user_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdEqualTo(Long value) {
-            addCriterion("user_id =", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotEqualTo(Long value) {
-            addCriterion("user_id <>", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdGreaterThan(Long value) {
-            addCriterion("user_id >", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("user_id >=", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdLessThan(Long value) {
-            addCriterion("user_id <", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdLessThanOrEqualTo(Long value) {
-            addCriterion("user_id <=", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIn(List<Long> values) {
-            addCriterion("user_id in", values, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotIn(List<Long> values) {
-            addCriterion("user_id not in", values, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdBetween(Long value1, Long value2) {
-            addCriterion("user_id between", value1, value2, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotBetween(Long value1, Long value2) {
-            addCriterion("user_id not between", value1, value2, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdIsNull() {
-            addCriterion("corp_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdIsNotNull() {
-            addCriterion("corp_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdEqualTo(Long value) {
-            addCriterion("corp_id =", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdNotEqualTo(Long value) {
-            addCriterion("corp_id <>", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdGreaterThan(Long value) {
-            addCriterion("corp_id >", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("corp_id >=", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdLessThan(Long value) {
-            addCriterion("corp_id <", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdLessThanOrEqualTo(Long value) {
-            addCriterion("corp_id <=", value, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdIn(List<Long> values) {
-            addCriterion("corp_id in", values, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdNotIn(List<Long> values) {
-            addCriterion("corp_id not in", values, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdBetween(Long value1, Long value2) {
-            addCriterion("corp_id between", value1, value2, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpIdNotBetween(Long value1, Long value2) {
-            addCriterion("corp_id not between", value1, value2, "corpId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidIsNull() {
-            addCriterion("unionid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidIsNotNull() {
-            addCriterion("unionid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidEqualTo(String value) {
-            addCriterion("unionid =", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidNotEqualTo(String value) {
-            addCriterion("unionid <>", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidGreaterThan(String value) {
-            addCriterion("unionid >", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidGreaterThanOrEqualTo(String value) {
-            addCriterion("unionid >=", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidLessThan(String value) {
-            addCriterion("unionid <", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidLessThanOrEqualTo(String value) {
-            addCriterion("unionid <=", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidLike(String value) {
-            addCriterion("unionid like", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidNotLike(String value) {
-            addCriterion("unionid not like", value, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidIn(List<String> values) {
-            addCriterion("unionid in", values, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidNotIn(List<String> values) {
-            addCriterion("unionid not in", values, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidBetween(String value1, String value2) {
-            addCriterion("unionid between", value1, value2, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUnionidNotBetween(String value1, String value2) {
-            addCriterion("unionid not between", value1, value2, "unionid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidIsNull() {
-            addCriterion("acctid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidIsNotNull() {
-            addCriterion("acctid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidEqualTo(String value) {
-            addCriterion("acctid =", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidNotEqualTo(String value) {
-            addCriterion("acctid <>", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidGreaterThan(String value) {
-            addCriterion("acctid >", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidGreaterThanOrEqualTo(String value) {
-            addCriterion("acctid >=", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidLessThan(String value) {
-            addCriterion("acctid <", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidLessThanOrEqualTo(String value) {
-            addCriterion("acctid <=", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidLike(String value) {
-            addCriterion("acctid like", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidNotLike(String value) {
-            addCriterion("acctid not like", value, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidIn(List<String> values) {
-            addCriterion("acctid in", values, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidNotIn(List<String> values) {
-            addCriterion("acctid not in", values, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidBetween(String value1, String value2) {
-            addCriterion("acctid between", value1, value2, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAcctidNotBetween(String value1, String value2) {
-            addCriterion("acctid not between", value1, value2, "acctid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionIsNull() {
-            addCriterion("`position` is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionIsNotNull() {
-            addCriterion("`position` is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionEqualTo(String value) {
-            addCriterion("`position` =", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionNotEqualTo(String value) {
-            addCriterion("`position` <>", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionGreaterThan(String value) {
-            addCriterion("`position` >", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionGreaterThanOrEqualTo(String value) {
-            addCriterion("`position` >=", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionLessThan(String value) {
-            addCriterion("`position` <", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionLessThanOrEqualTo(String value) {
-            addCriterion("`position` <=", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionLike(String value) {
-            addCriterion("`position` like", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionNotLike(String value) {
-            addCriterion("`position` not like", value, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionIn(List<String> values) {
-            addCriterion("`position` in", values, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionNotIn(List<String> values) {
-            addCriterion("`position` not in", values, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionBetween(String value1, String value2) {
-            addCriterion("`position` between", value1, value2, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andPositionNotBetween(String value1, String value2) {
-            addCriterion("`position` not between", value1, value2, "position");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameIsNull() {
-            addCriterion("english_name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameIsNotNull() {
-            addCriterion("english_name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameEqualTo(String value) {
-            addCriterion("english_name =", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameNotEqualTo(String value) {
-            addCriterion("english_name <>", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameGreaterThan(String value) {
-            addCriterion("english_name >", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameGreaterThanOrEqualTo(String value) {
-            addCriterion("english_name >=", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameLessThan(String value) {
-            addCriterion("english_name <", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameLessThanOrEqualTo(String value) {
-            addCriterion("english_name <=", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameLike(String value) {
-            addCriterion("english_name like", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameNotLike(String value) {
-            addCriterion("english_name not like", value, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameIn(List<String> values) {
-            addCriterion("english_name in", values, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameNotIn(List<String> values) {
-            addCriterion("english_name not in", values, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameBetween(String value1, String value2) {
-            addCriterion("english_name between", value1, value2, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnglishNameNotBetween(String value1, String value2) {
-            addCriterion("english_name not between", value1, value2, "englishName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameIsNull() {
-            addCriterion("corp_name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameIsNotNull() {
-            addCriterion("corp_name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameEqualTo(String value) {
-            addCriterion("corp_name =", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameNotEqualTo(String value) {
-            addCriterion("corp_name <>", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameGreaterThan(String value) {
-            addCriterion("corp_name >", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameGreaterThanOrEqualTo(String value) {
-            addCriterion("corp_name >=", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameLessThan(String value) {
-            addCriterion("corp_name <", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameLessThanOrEqualTo(String value) {
-            addCriterion("corp_name <=", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameLike(String value) {
-            addCriterion("corp_name like", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameNotLike(String value) {
-            addCriterion("corp_name not like", value, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameIn(List<String> values) {
-            addCriterion("corp_name in", values, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameNotIn(List<String> values) {
-            addCriterion("corp_name not in", values, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameBetween(String value1, String value2) {
-            addCriterion("corp_name between", value1, value2, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andCorpNameNotBetween(String value1, String value2) {
-            addCriterion("corp_name not between", value1, value2, "corpName");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusIsNull() {
-            addCriterion("login_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusIsNotNull() {
-            addCriterion("login_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusEqualTo(Boolean value) {
-            addCriterion("login_status =", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusNotEqualTo(Boolean value) {
-            addCriterion("login_status <>", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusGreaterThan(Boolean value) {
-            addCriterion("login_status >", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("login_status >=", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusLessThan(Boolean value) {
-            addCriterion("login_status <", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusLessThanOrEqualTo(Boolean value) {
-            addCriterion("login_status <=", value, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusIn(List<Boolean> values) {
-            addCriterion("login_status in", values, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusNotIn(List<Boolean> values) {
-            addCriterion("login_status not in", values, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusBetween(Boolean value1, Boolean value2) {
-            addCriterion("login_status between", value1, value2, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andLoginStatusNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("login_status not between", value1, value2, "loginStatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated do_not_delete_during_merge Wed May 14 16:14:51 CST 2025
-     */
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table qywx_user_corp
-     *
-     * @mbg.generated Wed May 14 16:14:51 CST 2025
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

+ 46 - 17
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/po/UserExample.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.risk.control.model.po;
 
+import com.tzld.piaoquan.risk.control.model.dto.Page;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -9,7 +10,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     protected String orderByClause;
 
@@ -17,7 +18,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     protected boolean distinct;
 
@@ -25,15 +26,23 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     protected List<Criteria> oredCriteria;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user
+     *
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
+     */
+    protected Page page;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public UserExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +52,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +62,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +72,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +82,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +92,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +102,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +112,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +124,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +138,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +149,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public void clear() {
         oredCriteria.clear();
@@ -148,11 +157,31 @@ public class UserExample {
         distinct = false;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user
+     *
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
+     */
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user
+     *
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
+     */
+    public Page getPage() {
+        return page;
+    }
+
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -660,7 +689,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table user
      *
-     * @mbg.generated do_not_delete_during_merge Wed May 21 19:08:42 CST 2025
+     * @mbg.generated do_not_delete_during_merge Thu May 22 19:38:00 CST 2025
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -673,7 +702,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table user
      *
-     * @mbg.generated Wed May 21 19:08:42 CST 2025
+     * @mbg.generated Thu May 22 19:38:00 CST 2025
      */
     public static class Criterion {
         private String condition;

+ 8 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/WorkWechatService.java

@@ -0,0 +1,8 @@
+package com.tzld.piaoquan.risk.control.service;
+
+import com.tzld.piaoquan.risk.control.model.dto.Page;
+import com.tzld.piaoquan.risk.control.model.dto.WorkWechatUserInfo;
+
+public interface WorkWechatService {
+    Page<WorkWechatUserInfo> findUserInfoList(int pageSize, int currentPage);
+}

+ 36 - 9
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/QwLoginServiceImpl.java

@@ -1,8 +1,11 @@
 package com.tzld.piaoquan.risk.control.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.tzld.piaoquan.risk.control.config.LoginUserContext;
 import com.tzld.piaoquan.risk.control.config.QywxConfig;
+import com.tzld.piaoquan.risk.control.dao.mapper.UserBaseMapper;
 import com.tzld.piaoquan.risk.control.model.po.UserBase;
+import com.tzld.piaoquan.risk.control.model.po.UserBaseExample;
 import com.tzld.piaoquan.risk.control.model.qywx.QwCommonResModel;
 import com.tzld.piaoquan.risk.control.model.qywx.QwInitResponseModel;
 import com.tzld.piaoquan.risk.control.model.qywx.QwLoginCheckCode;
@@ -10,7 +13,7 @@ import com.tzld.piaoquan.risk.control.model.qywx.QwLoginQRCodeModel;
 import com.tzld.piaoquan.risk.control.service.QwLoginService;
 import com.tzld.piaoquan.risk.control.util.HttpClientUtil;
 import com.tzld.piaoquan.risk.control.util.HttpPoolClient;
-import org.apache.http.util.TextUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -31,13 +35,14 @@ public class QwLoginServiceImpl implements QwLoginService {
     @Value("${qwcallback.url}")
     private String qwCallbackUrl;
     private static final Logger LOGGER = LoggerFactory.getLogger(QwLoginServiceImpl.class);
+    private UserBaseMapper userBaseMapper;
 
     @Override
-    public QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid,String platformPhone) {
+    public QwCommonResModel<QwLoginQRCodeModel> getLoginQRCode(String vid, String platformPhone) {
 //        UserBase user = qwUserService.getUserByMobile(platformPhone);
         String uuid = "";
-        uuid  = initUUID(vid);
-        //TODO 写入平台库表:platformPhone关联的uuid
+        uuid = initUUID(vid);
+        // TODO 写入平台库表:platformPhone关联的uuid
         LOGGER.info("getLoginQRCode,uuid: {}", uuid);
         System.out.println("getLoginQRCode,uuid: " + uuid);
         setCallback(uuid);
@@ -58,7 +63,7 @@ public class QwLoginServiceImpl implements QwLoginService {
     @Override
     public int checkQRCode(QwLoginCheckCode checkQrcode) {
         String url = qywxConfig.getDomain() + qywxConfig.getPath("login-checkcode");
-        Optional<String> response =  httpPoolClientDefault.postJson(url, JSON.toJSONString(checkQrcode));
+        Optional<String> response = httpPoolClientDefault.postJson(url, JSON.toJSONString(checkQrcode));
         System.out.println("checkQRCode,response: " + response);
         LOGGER.info("checkQRCode,response: {}", response);
         if (response.isPresent()) {
@@ -71,7 +76,7 @@ public class QwLoginServiceImpl implements QwLoginService {
     @Override
     public String getRunClients() {
         String url = qywxConfig.getDomain() + qywxConfig.getPath("get-clients");
-        Optional<String> response =  httpPoolClientDefault.postJson(url, "");
+        Optional<String> response = httpPoolClientDefault.postJson(url, "");
         System.out.println("getRunClients,response: " + response);
         if (response.isPresent()) {
             return response.get();
@@ -86,7 +91,8 @@ public class QwLoginServiceImpl implements QwLoginService {
         return qwUserService.getUserByUuid(uuid);
     }
 
-    private String initUUID(String vid){
+    private String initUUID(String vid) {
+        Long userId = LoginUserContext.getUserId();
         Map<String, Object> requestBody = new HashMap<>();
         requestBody.put("vid", vid); // Add vid if available,二次登录使用上一次结果
         requestBody.put("ip", ""); // Add proxy IP if available
@@ -99,12 +105,14 @@ public class QwLoginServiceImpl implements QwLoginService {
         // Convert the request body to JSON string
         String params = JSON.toJSONString(requestBody);
         String url = qywxConfig.getDomain() + qywxConfig.getPath("init-uuid");
-        Optional<String> response =  httpPoolClientDefault.postJson(url, params);
+        Optional<String> response = httpPoolClientDefault.postJson(url, params);
         // 直接解析 JSON
         if (response.isPresent()) {
             System.out.println("init,response: " + response);
             QwCommonResModel<QwInitResponseModel> initModel = QwCommonResModel.parseResponse(response.get(), QwInitResponseModel.class);
-            return initModel.getData().getUuid();
+            String uuid = initModel.getData().getUuid();
+            this.saveUserBaseUUID(uuid, userId);
+            return uuid;
         } else {
             return "";
         }
@@ -133,4 +141,23 @@ public class QwLoginServiceImpl implements QwLoginService {
             System.out.println("Failed to set callback: No response");
         }
     }
+
+    private void saveUserBaseUUID(String uuid, Long userId) {
+        UserBaseExample example = new UserBaseExample();
+        example.createCriteria().andUuidEqualTo(uuid);
+        List<UserBase> userBases = userBaseMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(userBases)) {
+            UserBase update = userBases.get(0);
+            update.setUpdateUser(userId);
+            update.setUuid(uuid);
+            update.setCreateUser(userId);
+            userBaseMapper.updateByPrimaryKeySelective(update);
+        } else {
+            UserBase userBase = new UserBase();
+            userBase.setUuid(uuid);
+            userBase.setCreateUser(userId);
+            userBase.setUpdateUser(userId);
+            userBaseMapper.insertSelective(userBase);
+        }
+    }
 }

+ 6 - 52
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/QywxUserDataService.java

@@ -4,11 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.github.pagehelper.PageHelper;
 import com.tzld.piaoquan.risk.control.dao.mapper.UserBaseMapper;
-import com.tzld.piaoquan.risk.control.dao.mapper.UserCorpMapper;
 import com.tzld.piaoquan.risk.control.model.po.UserBase;
 import com.tzld.piaoquan.risk.control.model.po.UserBaseExample;
-import com.tzld.piaoquan.risk.control.model.po.UserCorp;
-import com.tzld.piaoquan.risk.control.model.po.UserCorpExample;
 import com.tzld.piaoquan.risk.control.model.qywx.QwCallBackWrapperData;
 import com.tzld.piaoquan.risk.control.service.qywx.Constant;
 import lombok.Data;
@@ -28,9 +25,6 @@ public class QywxUserDataService {
     @Autowired
     private UserBaseMapper userBaseMapper;
 
-    @Autowired
-    private UserCorpMapper userCorpMapper;
-
     @Data
     @NoArgsConstructor
     private static class UserData {
@@ -119,25 +113,21 @@ public class QywxUserDataService {
 
         // 3. 处理用户基础信息
         UserBase userBase = processBaseInfo(wrapperData, userData);
-
-        // 4. 处理企业关联信息
-        try {
-            processCorpRelation(Long.parseLong(userBase.getVid()), userData);
-        } catch (Exception e) {
-            log.error("Error processing user data: {}", e.getMessage(), e);
-        }
     }
 
     private UserBase processBaseInfo(QwCallBackWrapperData envelop, UserData data) {
         UserBase userBase = new UserBase();
         userBase.setUuid(envelop.getUuid());
+        userBase.setVid(data.vid.toString());
         userBase.setMobile(data.mobile);
         userBase.setRealname(data.realName);
+        userBase.setEnglishName(data.englishName);
         userBase.setAvatar(data.avatarUrl);
         userBase.setLoginStatus(envelop.getType() == Constant.LOGIN_SUCCESS ? 1 : 0);
-        userBase.setVid(data.vid.toString());
-        userBase.setUpdateTime(new Date());
-
+        userBase.setCorpId(data.corpId);
+        userBase.setCorpName(data.corpName);
+        userBase.setUnionid(data.unionId);
+        userBase.setPosition(data.jobPosition);
 
         // 时间处理(优先使用Create_time)
         Long createTime = data.createTime2 != null && data.createTime2 > 0 ? data.createTime2 : data.createTime1;
@@ -161,42 +151,6 @@ public class QywxUserDataService {
         return userBase;
     }
 
-    private void processCorpRelation(Long userId, UserData data) {
-        UserCorp userCorp = new UserCorp();
-        userCorp.setUserId(userId);
-        userCorp.setCorpId(data.corpId != null ? data.corpId : data.corpId2);
-//        userCorp.setAdminVid(data.adminVid);
-        userCorp.setUnionid(data.unionId);
-//        userCorp.setAccountId(data.accountId);
-        userCorp.setPosition(data.jobPosition);
-//        userCorp.setStatus((byte) 0);
-        userCorp.setUpdateTime(new Date());
-        userCorp.setCorpName(data.corpName);
-//        userCorp.setCorpFullName(data.corpFullName);
-//        userCorp.setCorpLogo(data.corpLogo);
-//        userCorp.setCorpDesc(data.corpDesc);
-//        userCorp.setSCorpId(data.sCorpId);
-//        userCorp.setOwnerName(data.ownerName);
-        userCorp.setEnglishName(data.englishName);
-        userCorp.setUpdateTime(new Date());
-//        userCorp.setVid(data.vid);
-
-        UserCorpExample example = new UserCorpExample();
-        example.createCriteria()
-                .andUserIdEqualTo(userId)
-                .andCorpIdEqualTo(userCorp.getCorpId());
-
-        List<UserCorp> existRelations = userCorpMapper.selectByExample(example);
-
-        if (!existRelations.isEmpty()) {
-            UserCorp existRelation = existRelations.get(0);
-            userCorp.setId(existRelation.getId());
-            userCorpMapper.updateByPrimaryKeySelective(userCorp);
-        } else {
-            userCorpMapper.insertSelective(userCorp);
-        }
-    }
-
     // 根据手机号查询用户
     public UserBase getUserByMobile(String mobile) {
         UserBaseExample example = new UserBaseExample();

+ 1 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/UserServiceImpl.java

@@ -62,6 +62,7 @@ public class UserServiceImpl implements UserService {
         // 设置Token缓存
         String token = TokenUtil.genTokenByUUIDFormat();
         String key = RedisPrefixEnum.RISK_CONTROL_TOKEN.getPrefix().replace("{token}", token);
+        user.setPassword(null);
         redisUtils.set(key, JSON.toJSONString(user), 24 * 60 * 60);
 
         LoginDTO loginDTO = new LoginDTO();

+ 40 - 0
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/WorkWechatServiceImpl.java

@@ -0,0 +1,40 @@
+package com.tzld.piaoquan.risk.control.service.impl;
+
+import com.tzld.piaoquan.risk.control.config.LoginUserContext;
+import com.tzld.piaoquan.risk.control.dao.mapper.UserBaseMapper;
+import com.tzld.piaoquan.risk.control.model.dto.Page;
+import com.tzld.piaoquan.risk.control.model.dto.WorkWechatUserInfo;
+import com.tzld.piaoquan.risk.control.model.po.UserBase;
+import com.tzld.piaoquan.risk.control.model.po.UserBaseExample;
+import com.tzld.piaoquan.risk.control.service.WorkWechatService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class WorkWechatServiceImpl implements WorkWechatService {
+
+    @Autowired
+    private UserBaseMapper userBaseMapper;
+
+    @Override
+    public Page<WorkWechatUserInfo> findUserInfoList(int pageSize, int currentPage) {
+
+        Page<WorkWechatUserInfo> page = new Page<>();
+        Long userId = LoginUserContext.getUserId();
+
+        UserBaseExample userBaseExample = new UserBaseExample();
+        userBaseExample.setPage(new Page<UserBase>(currentPage, pageSize));
+        List<UserBase> userBases = userBaseMapper.selectByExample(userBaseExample);
+        if (CollectionUtils.isNotEmpty(userBases)) {
+            List<String> vids = userBases.stream().map(UserBase::getVid).distinct().collect(Collectors.toList());
+        }
+
+        return page;
+    }
+}

+ 150 - 22
risk-control-core/src/main/resources/mapper/UserBaseMapper.xml

@@ -5,15 +5,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="uuid" jdbcType="VARCHAR" property="uuid" />
     <result column="vid" jdbcType="VARCHAR" property="vid" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
     <result column="realname" jdbcType="VARCHAR" property="realname" />
+    <result column="english_name" jdbcType="VARCHAR" property="englishName" />
     <result column="avatar" jdbcType="VARCHAR" property="avatar" />
     <result column="login_status" jdbcType="INTEGER" property="loginStatus" />
+    <result column="corp_id" jdbcType="BIGINT" property="corpId" />
+    <result column="corp_name" jdbcType="VARCHAR" property="corpName" />
+    <result column="unionid" jdbcType="VARCHAR" property="unionid" />
+    <result column="acctid" jdbcType="VARCHAR" property="acctid" />
+    <result column="position" jdbcType="VARCHAR" property="position" />
+    <result column="create_user" jdbcType="BIGINT" property="createUser" />
+    <result column="update_user" jdbcType="BIGINT" property="updateUser" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -21,7 +29,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,15 +97,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
-    id, uuid, vid, mobile, realname, avatar, login_status, create_time, update_time
+    id, uuid, vid, mobile, realname, english_name, avatar, login_status, corp_id, corp_name, 
+    unionid, acctid, `position`, create_user, update_user, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.risk.control.model.po.UserBaseExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     select
     <if test="distinct">
@@ -111,12 +120,15 @@
     <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -127,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     delete from qywx_user_base
     where id = #{id,jdbcType=BIGINT}
@@ -136,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     delete from qywx_user_base
     <if test="_parameter != null">
@@ -147,22 +159,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     insert into qywx_user_base (id, uuid, vid, 
-      mobile, realname, avatar, 
-      login_status, create_time, update_time
-      )
+      mobile, realname, english_name, 
+      avatar, login_status, corp_id, 
+      corp_name, unionid, acctid, 
+      `position`, create_user, update_user, 
+      create_time, update_time)
     values (#{id,jdbcType=BIGINT}, #{uuid,jdbcType=VARCHAR}, #{vid,jdbcType=VARCHAR}, 
-      #{mobile,jdbcType=VARCHAR}, #{realname,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
-      #{loginStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{mobile,jdbcType=VARCHAR}, #{realname,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR}, 
+      #{avatar,jdbcType=VARCHAR}, #{loginStatus,jdbcType=INTEGER}, #{corpId,jdbcType=BIGINT}, 
+      #{corpName,jdbcType=VARCHAR}, #{unionid,jdbcType=VARCHAR}, #{acctid,jdbcType=VARCHAR}, 
+      #{position,jdbcType=VARCHAR}, #{createUser,jdbcType=BIGINT}, #{updateUser,jdbcType=BIGINT}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.risk.control.model.po.UserBase">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     insert into qywx_user_base
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -181,12 +197,36 @@
       <if test="realname != null">
         realname,
       </if>
+      <if test="englishName != null">
+        english_name,
+      </if>
       <if test="avatar != null">
         avatar,
       </if>
       <if test="loginStatus != null">
         login_status,
       </if>
+      <if test="corpId != null">
+        corp_id,
+      </if>
+      <if test="corpName != null">
+        corp_name,
+      </if>
+      <if test="unionid != null">
+        unionid,
+      </if>
+      <if test="acctid != null">
+        acctid,
+      </if>
+      <if test="position != null">
+        `position`,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -210,12 +250,36 @@
       <if test="realname != null">
         #{realname,jdbcType=VARCHAR},
       </if>
+      <if test="englishName != null">
+        #{englishName,jdbcType=VARCHAR},
+      </if>
       <if test="avatar != null">
         #{avatar,jdbcType=VARCHAR},
       </if>
       <if test="loginStatus != null">
         #{loginStatus,jdbcType=INTEGER},
       </if>
+      <if test="corpId != null">
+        #{corpId,jdbcType=BIGINT},
+      </if>
+      <if test="corpName != null">
+        #{corpName,jdbcType=VARCHAR},
+      </if>
+      <if test="unionid != null">
+        #{unionid,jdbcType=VARCHAR},
+      </if>
+      <if test="acctid != null">
+        #{acctid,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=BIGINT},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=BIGINT},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -228,7 +292,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     select count(*) from qywx_user_base
     <if test="_parameter != null">
@@ -239,7 +303,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     update qywx_user_base
     <set>
@@ -258,12 +322,36 @@
       <if test="record.realname != null">
         realname = #{record.realname,jdbcType=VARCHAR},
       </if>
+      <if test="record.englishName != null">
+        english_name = #{record.englishName,jdbcType=VARCHAR},
+      </if>
       <if test="record.avatar != null">
         avatar = #{record.avatar,jdbcType=VARCHAR},
       </if>
       <if test="record.loginStatus != null">
         login_status = #{record.loginStatus,jdbcType=INTEGER},
       </if>
+      <if test="record.corpId != null">
+        corp_id = #{record.corpId,jdbcType=BIGINT},
+      </if>
+      <if test="record.corpName != null">
+        corp_name = #{record.corpName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unionid != null">
+        unionid = #{record.unionid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.acctid != null">
+        acctid = #{record.acctid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.position != null">
+        `position` = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateUser != null">
+        update_user = #{record.updateUser,jdbcType=BIGINT},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -279,7 +367,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     update qywx_user_base
     set id = #{record.id,jdbcType=BIGINT},
@@ -287,8 +375,16 @@
       vid = #{record.vid,jdbcType=VARCHAR},
       mobile = #{record.mobile,jdbcType=VARCHAR},
       realname = #{record.realname,jdbcType=VARCHAR},
+      english_name = #{record.englishName,jdbcType=VARCHAR},
       avatar = #{record.avatar,jdbcType=VARCHAR},
       login_status = #{record.loginStatus,jdbcType=INTEGER},
+      corp_id = #{record.corpId,jdbcType=BIGINT},
+      corp_name = #{record.corpName,jdbcType=VARCHAR},
+      unionid = #{record.unionid,jdbcType=VARCHAR},
+      acctid = #{record.acctid,jdbcType=VARCHAR},
+      `position` = #{record.position,jdbcType=VARCHAR},
+      create_user = #{record.createUser,jdbcType=BIGINT},
+      update_user = #{record.updateUser,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -299,7 +395,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     update qywx_user_base
     <set>
@@ -315,12 +411,36 @@
       <if test="realname != null">
         realname = #{realname,jdbcType=VARCHAR},
       </if>
+      <if test="englishName != null">
+        english_name = #{englishName,jdbcType=VARCHAR},
+      </if>
       <if test="avatar != null">
         avatar = #{avatar,jdbcType=VARCHAR},
       </if>
       <if test="loginStatus != null">
         login_status = #{loginStatus,jdbcType=INTEGER},
       </if>
+      <if test="corpId != null">
+        corp_id = #{corpId,jdbcType=BIGINT},
+      </if>
+      <if test="corpName != null">
+        corp_name = #{corpName,jdbcType=VARCHAR},
+      </if>
+      <if test="unionid != null">
+        unionid = #{unionid,jdbcType=VARCHAR},
+      </if>
+      <if test="acctid != null">
+        acctid = #{acctid,jdbcType=VARCHAR},
+      </if>
+      <if test="position != null">
+        `position` = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=BIGINT},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=BIGINT},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -334,15 +454,23 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
+      This element was generated on Thu May 22 20:07:47 CST 2025.
     -->
     update qywx_user_base
     set uuid = #{uuid,jdbcType=VARCHAR},
       vid = #{vid,jdbcType=VARCHAR},
       mobile = #{mobile,jdbcType=VARCHAR},
       realname = #{realname,jdbcType=VARCHAR},
+      english_name = #{englishName,jdbcType=VARCHAR},
       avatar = #{avatar,jdbcType=VARCHAR},
       login_status = #{loginStatus,jdbcType=INTEGER},
+      corp_id = #{corpId,jdbcType=BIGINT},
+      corp_name = #{corpName,jdbcType=VARCHAR},
+      unionid = #{unionid,jdbcType=VARCHAR},
+      acctid = #{acctid,jdbcType=VARCHAR},
+      `position` = #{position,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=BIGINT},
+      update_user = #{updateUser,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}

+ 0 - 366
risk-control-core/src/main/resources/mapper/UserCorpMapper.xml

@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tzld.piaoquan.risk.control.dao.mapper.UserCorpMapper">
-  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.risk.control.model.po.UserCorp">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="corp_id" jdbcType="BIGINT" property="corpId" />
-    <result column="unionid" jdbcType="VARCHAR" property="unionid" />
-    <result column="acctid" jdbcType="VARCHAR" property="acctid" />
-    <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="english_name" jdbcType="VARCHAR" property="englishName" />
-    <result column="corp_name" jdbcType="VARCHAR" property="corpName" />
-    <result column="login_status" jdbcType="BIT" property="loginStatus" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    id, user_id, corp_id, unionid, acctid, `position`, english_name, corp_name, login_status, 
-    update_time
-  </sql>
-  <select id="selectByExample" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorpExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from qywx_user_corp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from qywx_user_corp
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    delete from qywx_user_corp
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorpExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    delete from qywx_user_corp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorp">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    insert into qywx_user_corp (id, user_id, corp_id, 
-      unionid, acctid, `position`, 
-      english_name, corp_name, login_status, 
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{corpId,jdbcType=BIGINT}, 
-      #{unionid,jdbcType=VARCHAR}, #{acctid,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
-      #{englishName,jdbcType=VARCHAR}, #{corpName,jdbcType=VARCHAR}, #{loginStatus,jdbcType=BIT}, 
-      #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorp">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    insert into qywx_user_corp
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="corpId != null">
-        corp_id,
-      </if>
-      <if test="unionid != null">
-        unionid,
-      </if>
-      <if test="acctid != null">
-        acctid,
-      </if>
-      <if test="position != null">
-        `position`,
-      </if>
-      <if test="englishName != null">
-        english_name,
-      </if>
-      <if test="corpName != null">
-        corp_name,
-      </if>
-      <if test="loginStatus != null">
-        login_status,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="userId != null">
-        #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="corpId != null">
-        #{corpId,jdbcType=BIGINT},
-      </if>
-      <if test="unionid != null">
-        #{unionid,jdbcType=VARCHAR},
-      </if>
-      <if test="acctid != null">
-        #{acctid,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="englishName != null">
-        #{englishName,jdbcType=VARCHAR},
-      </if>
-      <if test="corpName != null">
-        #{corpName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginStatus != null">
-        #{loginStatus,jdbcType=BIT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorpExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    select count(*) from qywx_user_corp
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    update qywx_user_corp
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.userId != null">
-        user_id = #{record.userId,jdbcType=BIGINT},
-      </if>
-      <if test="record.corpId != null">
-        corp_id = #{record.corpId,jdbcType=BIGINT},
-      </if>
-      <if test="record.unionid != null">
-        unionid = #{record.unionid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.acctid != null">
-        acctid = #{record.acctid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.position != null">
-        `position` = #{record.position,jdbcType=VARCHAR},
-      </if>
-      <if test="record.englishName != null">
-        english_name = #{record.englishName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.corpName != null">
-        corp_name = #{record.corpName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.loginStatus != null">
-        login_status = #{record.loginStatus,jdbcType=BIT},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    update qywx_user_corp
-    set id = #{record.id,jdbcType=BIGINT},
-      user_id = #{record.userId,jdbcType=BIGINT},
-      corp_id = #{record.corpId,jdbcType=BIGINT},
-      unionid = #{record.unionid,jdbcType=VARCHAR},
-      acctid = #{record.acctid,jdbcType=VARCHAR},
-      `position` = #{record.position,jdbcType=VARCHAR},
-      english_name = #{record.englishName,jdbcType=VARCHAR},
-      corp_name = #{record.corpName,jdbcType=VARCHAR},
-      login_status = #{record.loginStatus,jdbcType=BIT},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorp">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    update qywx_user_corp
-    <set>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="corpId != null">
-        corp_id = #{corpId,jdbcType=BIGINT},
-      </if>
-      <if test="unionid != null">
-        unionid = #{unionid,jdbcType=VARCHAR},
-      </if>
-      <if test="acctid != null">
-        acctid = #{acctid,jdbcType=VARCHAR},
-      </if>
-      <if test="position != null">
-        `position` = #{position,jdbcType=VARCHAR},
-      </if>
-      <if test="englishName != null">
-        english_name = #{englishName,jdbcType=VARCHAR},
-      </if>
-      <if test="corpName != null">
-        corp_name = #{corpName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginStatus != null">
-        login_status = #{loginStatus,jdbcType=BIT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.risk.control.model.po.UserCorp">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 14 16:14:51 CST 2025.
-    -->
-    update qywx_user_corp
-    set user_id = #{userId,jdbcType=BIGINT},
-      corp_id = #{corpId,jdbcType=BIGINT},
-      unionid = #{unionid,jdbcType=VARCHAR},
-      acctid = #{acctid,jdbcType=VARCHAR},
-      `position` = #{position,jdbcType=VARCHAR},
-      english_name = #{englishName,jdbcType=VARCHAR},
-      corp_name = #{corpName,jdbcType=VARCHAR},
-      login_status = #{loginStatus,jdbcType=BIT},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

+ 18 - 15
risk-control-core/src/main/resources/mapper/UserMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
@@ -19,7 +19,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -53,7 +53,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -87,7 +87,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     id, phone, email, `name`, `password`, create_time, update_time
   </sql>
@@ -95,7 +95,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     select
     <if test="distinct">
@@ -109,12 +109,15 @@
     <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     delete from user
     where id = #{id,jdbcType=BIGINT}
@@ -134,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     delete from user
     <if test="_parameter != null">
@@ -145,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     insert into user (id, phone, email, 
       `name`, `password`, create_time, 
@@ -158,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     insert into user
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,7 +215,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     select count(*) from user
     <if test="_parameter != null">
@@ -223,7 +226,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     update user
     <set>
@@ -257,7 +260,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     update user
     set id = #{record.id,jdbcType=BIGINT},
@@ -275,7 +278,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     update user
     <set>
@@ -304,7 +307,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed May 21 19:08:42 CST 2025.
+      This element was generated on Thu May 22 19:38:00 CST 2025.
     -->
     update user
     set phone = #{phone,jdbcType=VARCHAR},

+ 4 - 2
risk-control-core/src/main/resources/mybatis-generator-config.xml

@@ -15,6 +15,7 @@
         <!-- 插件配置 -->
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
         <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin"/>
+        <plugin type="com.tzld.piaoquan.risk.control.dao.plugin.PaginationPlugin"/>
 
         <!-- 注释生成 -->
         <commentGenerator>
@@ -55,7 +56,8 @@
         </javaClientGenerator>
 
         <!-- 表配置 -->
-        <table tableName="user" domainObjectName="User"/>
-        <!-- <table tableName="qywx_user_corp" domainObjectName="UserCorp"/> -->
+        <!-- <table tableName="user" domainObjectName="User"/> -->
+        <table tableName="qywx_user_base" domainObjectName="UserBase"/>
+        <!-- <table tableName="work_wechat_room_info" domainObjectName="WorkWechatRoomInfo"/> -->
     </context>
 </generatorConfiguration>

+ 3 - 4
risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/UserController.java

@@ -2,15 +2,14 @@ package com.tzld.piaoquan.risk.control.controller;
 
 import com.tzld.piaoquan.risk.control.common.annotation.UnAuth;
 import com.tzld.piaoquan.risk.control.common.base.CommonResponse;
+import com.tzld.piaoquan.risk.control.config.LoginUserContext;
 import com.tzld.piaoquan.risk.control.model.dto.LoginDTO;
 import com.tzld.piaoquan.risk.control.model.param.LoginAndRegisterParam;
+import com.tzld.piaoquan.risk.control.model.po.User;
 import com.tzld.piaoquan.risk.control.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController

+ 28 - 0
risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/WorkWechatController.java

@@ -0,0 +1,28 @@
+package com.tzld.piaoquan.risk.control.controller;
+
+import com.tzld.piaoquan.risk.control.common.base.CommonResponse;
+import com.tzld.piaoquan.risk.control.model.dto.Page;
+import com.tzld.piaoquan.risk.control.model.dto.WorkWechatUserInfo;
+import com.tzld.piaoquan.risk.control.service.WorkWechatService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/work/wechat")
+public class WorkWechatController {
+
+    @Autowired
+    private WorkWechatService workWechatService;
+
+    @GetMapping("/user/info/page")
+    public CommonResponse<Page<WorkWechatUserInfo>> page(@RequestParam("pageSize") int pageSize, @RequestParam("currentPage") int currentPage) {
+        log.info("[work wechat findUserInfoList] pageSize:{}, currentPage:{}", pageSize, currentPage);
+        return CommonResponse.create(workWechatService.findUserInfoList(pageSize, currentPage));
+    }
+
+}