创客信息管理接口部分添加

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/RestPwdDTO.java

@@ -0,0 +1,20 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 重置密码-dto
+ * @author debao.yang
+ * @createTime 2024-06-24 16:40
+ */
+@Data
+public class RestPwdDTO {
+
+    @NotBlank(message = "用户id不能为空")
+    @Schema(description = "用户id")
+    private String userId;
+
+    private String password;
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserAdvancePageDTO.java

@@ -0,0 +1,46 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 创客预扣款-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+public class SysUserAdvancePageDTO {
+
+    /**
+     * 预扣款类型 普通预扣款=1  分期预扣款=2 机具过期预扣款=124
+     */
+    @Schema(description = "预扣款类型 普通预扣款=1  分期预扣款=2 机具过期预扣款=124")
+    private Integer advanceType;
+
+
+    /**
+     * 扣款标识 0未扣 1已扣 2撤销|已返还 3暂停扣款
+     */
+    @Schema(description = "扣款标识 0未扣 1已扣 2撤销|已返还 3暂停扣款")
+    private Integer status;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object username;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserLogoutListDTO.java

@@ -0,0 +1,53 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 已注销创客-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:01
+ */
+@Data
+public class SysUserLogoutListDTO {
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private Object idCard;
+
+
+    /**
+     * 时间区间['time','time']
+     */
+    @Schema(description = "时间区间['time','time']")
+    private Object updateTime;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserPageDTO.java

@@ -0,0 +1,46 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 创客信息-列表-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+public class SysUserPageDTO {
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private Object idCard;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserUnRealUserPageDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 未实名开放列表-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+public class SysUserUnRealUserPageDTO {
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private String username;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private String userCode;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserUserAccountListDTO.java

@@ -0,0 +1,39 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 创客账户信息-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:01
+ */
+@Data
+public class SysUserUserAccountListDTO {
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserWhereListDTO.java

@@ -0,0 +1,39 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 创客信息-上下级创客-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:01
+ */
+@Data
+public class SysUserWhereListDTO {
+
+    /**
+     * 创客ID
+     */
+    @NotBlank(message = "创客ID不能为空")
+    @Schema(description = "创客ID")
+    private String userId;
+
+
+    /**
+     * 0上级创客 1下级直属创客
+     */
+    @Schema(description = "0上级创客 1下级直属创客")
+    private Object queryType;
+
+    /**
+     * 父id
+     */
+    private Integer pid;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserWithdrawalPageDTO.java

@@ -0,0 +1,46 @@
+package com.kxs.user.api.dto.admin.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 创客提现管理-dto
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+public class SysUserWithdrawalPageDTO {
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String applyNo;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object username;
+
+
+    /**
+     * 提现时间区间['','']
+     */
+    @Schema(description = "提现时间区间['','']")
+    private Object createTime;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserAdvancePageVO.java

@@ -0,0 +1,54 @@
+package com.kxs.user.api.vo.admin.user;
+
+
+import com.kxs.user.api.model.KxsUserAdvance;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 创客预扣款vo
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+@Schema(description = "创客预扣款返回实体")
+public class SysUserAdvancePageVO extends KxsUserAdvance implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object username;
+
+
+    /**
+     * 创客电话
+     */
+    @Schema(description = "创客电话")
+    private Object phone;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserUserAccountListVO.java

@@ -0,0 +1,80 @@
+package com.kxs.user.api.vo.admin.user;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 创客账户信息vo
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+@Schema(description = "创客账户信息返回实体")
+public class SysUserUserAccountListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 更新时间
+     */
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+    /**
+     * 备注信息
+     */
+    @Schema(description = "备注信息")
+    private String remark;
+
+
+    /**
+     * 账户余额
+     */
+    @Schema(description = "账户余额")
+    private Object amount;
+
+
+    /**
+     * 0锁定 1正常
+     */
+    @Schema(description = "0锁定 1正常")
+    private Object status;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserWhereListVO.java

@@ -0,0 +1,136 @@
+package com.kxs.user.api.vo.admin.user;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 创客信息-上下级创客vo
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:01
+ */
+@Data
+@Schema(description = "创客信息-上下级创客返回实体")
+public class SysUserWhereListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+    /**
+     * 用户等级
+     */
+    @Schema(description = "用户等级")
+    private Integer userLevel;
+
+
+    /**
+     * 状态 0注销 1正常 2锁定不可登陆和提现
+     */
+    @Schema(description = "状态 0注销 1正常 2锁定不可登陆和提现")
+    private Integer status;
+
+
+    /**
+     * 是否商户型创客 0否 1是
+     */
+    @Schema(description = "是否商户型创客 0否 1是")
+    private Integer isMerchantMaker;
+
+
+    /**
+     * 实名时间
+     */
+    @Schema(description = "实名时间")
+    private Object realTime;
+
+
+    /**
+     * 上级创客姓名
+     */
+    @Schema(description = "上级创客姓名")
+    private Object pUsername;
+
+
+    /**
+     * 上级创客编码
+     */
+    @Schema(description = "上级创客编码")
+    private Object pUserCode;
+
+
+    /**
+     * 顶级创客姓名
+     */
+    @Schema(description = "顶级创客姓名")
+    private Object topUsername;
+
+
+    /**
+     * 顶级创客编号
+     */
+    @Schema(description = "顶级创客编号")
+    private Object topUserCode;
+
+
+    /**
+     * 是否盟主 1是
+     */
+    @Schema(description = "是否盟主 1是")
+    private Object isLeader;
+
+
+    /**
+     * 是否合伙人 1是
+     */
+    @Schema(description = "是否合伙人 1是")
+    private Object isPartner;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/admin/user/SysUserWithdrawalPageVO.java

@@ -0,0 +1,48 @@
+package com.kxs.user.api.vo.admin.user;
+
+
+import com.kxs.user.api.model.KxsUserWithdrawal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 创客提现管理vo
+ *
+ * @author 系统
+ * @date 2024-06-24 09:30:02
+ */
+@Data
+@Schema(description = "创客提现管理返回实体")
+public class SysUserWithdrawalPageVO extends KxsUserWithdrawal implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object username;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private Object idCard;
+
+
+}

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserAdvanceController.java

@@ -0,0 +1,49 @@
+package com.kxs.user.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
+import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+import com.kxs.user.biz.service.KxsUserAdvanceService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 创客信息管理(SysUserAdvance)控制层
+ *
+ * @author 系统
+ * @since 2024-06-24 09:30:02
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysUserAdvance")
+public class SysUserAdvanceController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsUserAdvanceService kxsUserAdvanceService;
+
+
+
+    /**
+     * 创客预扣款
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 创客预扣款
+     */
+    @GetMapping("/page")
+    public R userAdvancePage(Page<SysUserAdvancePageVO> page, SysUserAdvancePageDTO param) {
+        kxsUserAdvanceService.userAdvancePage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserController.java

@@ -0,0 +1,216 @@
+package com.kxs.user.biz.controller.admin;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.constant.enums.UserStatusEnum;
+import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.RestPwdDTO;
+import com.kxs.user.api.dto.admin.user.SysUserLogoutListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserPageDTO;
+import com.kxs.user.api.dto.admin.user.SysUserUnRealUserPageDTO;
+import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserWhereListDTO;
+import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.vo.admin.user.SysUserWhereListVO;
+import com.kxs.user.biz.constant.enums.UserRealStatusEnum;
+import com.kxs.user.biz.service.KxsUserReRealService;
+import com.kxs.user.biz.service.KxsUserService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 创客信息管理(SysUser)控制层
+ *
+ * @author 系统
+ * @since 2024-06-24 09:30:02
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysUser")
+public class SysUserController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsUserService kxsUserService;
+    private final KxsUserReRealService kxsUserReRealService;
+
+
+
+    /**
+     * 创客信息-上下级创客
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 创客信息-上下级创客
+     */
+    @GetMapping("/whereList")
+    public R whereList(Page<SysUserWhereListVO> page, @Valid SysUserWhereListDTO param) {
+        kxsUserService.getUserWhereList(page, param);
+        return R.ok(page);
+    }
+
+
+    /**
+     * 已注销创客
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 已注销创客
+     */
+    @GetMapping("/logoutList")
+    public R logoutList(Page<KxsUser> page, SysUserLogoutListDTO param) {
+        kxsUserService.getLogoutListPage(page, param);
+        return R.ok(page);
+    }
+
+
+    /**
+     * 创客账户信息
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 创客账户信息
+     */
+    @GetMapping("/userAccountList")
+    public R userAccountList(Page<KxsUser> page, SysUserUserAccountListDTO param) {
+        kxsUserService.userAccountPage(page, param);
+        return R.ok(page);
+    }
+
+
+    /**
+     * 未实名开放列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 未实名开放列表
+     */
+    @GetMapping("/unRealUserPage")
+    public R unRealUserPage(Page<KxsUser> page, SysUserUnRealUserPageDTO param) {
+        return R.ok(kxsUserService.page(page, Wrappers.<KxsUser>lambdaQuery()
+                .eq(KxsUser::getRealStatus, UserRealStatusEnum.NO.getType())
+                .like(StrUtil.isNotEmpty(param.getUsername()),KxsUser::getUsername,param.getUsername())
+                .eq(StrUtil.isNotEmpty(param.getUserCode()), KxsUser::getUserCode, param.getUserCode())));
+    }
+
+
+    /**
+     * 创客信息-列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 创客信息-列表
+     */
+    @GetMapping("/page")
+    public R page(Page<KxsUser> page, @ParameterObject SysUserPageDTO param) {
+        kxsUserService.getUserPage(page, param);
+        return R.ok(page);
+    }
+
+
+    /**
+     * 创客信息-注销
+     *
+     * @param userId 创客ID结合
+     * @return 创客信息-注销
+     */
+    @DeleteMapping("/logout/{userId}")
+    public R logout(@PathVariable("userId") String userId) {
+        kxsUserService.updateStatusByUserId(userId, UserStatusEnum.REMOVE);
+        return R.ok();
+    }
+
+    /**
+     * 创客信息-注销(批量)
+     *
+     * @param userIdList 创客ID结合
+     * @return 创客信息-注销
+     */
+    @DeleteMapping("/logout/batch")
+    public R batchLogout(@RequestParam("userIdList") List<String> userIdList) {
+        kxsUserService.updateStatusByUserIds(userIdList,UserStatusEnum.REMOVE);
+        return R.ok();
+    }
+
+
+    /**
+     * 创客信息-重置密码
+     *
+     * @param param 实体对象
+     * @return 创客信息-重置密码
+     */
+    @PutMapping("/restPwd")
+    public R restPwd(@RequestBody RestPwdDTO param) {
+        kxsUserService.restPwd(param);
+        return R.ok();
+    }
+
+
+    /**
+     * 创客信息-锁定
+     *
+     * @param userId 创客ID结合
+     * @return 创客信息-锁定
+     */
+    @DeleteMapping("/lockUser/{userId}")
+    public R lockUser(@PathVariable("userId") String userId) {
+        kxsUserService.updateStatusByUserId(userId,UserStatusEnum.LOCKED);
+        return R.ok();
+    }
+
+    /**
+     * 创客信息-锁定(批量操作)
+     *
+     * @param userIdList 创客ID结合
+     * @return 创客信息-锁定
+     */
+    @DeleteMapping("/lockUser/batch")
+    public R batchLockUser(@RequestParam("userIdList") List<String> userIdList) {
+        kxsUserService.updateStatusByUserIds(userIdList,UserStatusEnum.LOCKED);
+        return R.ok();
+    }
+
+
+//    /**
+//     * 创客信息-交易额查询
+//     *
+//     * @param userCode 邀请码
+//     * @return 创客信息-交易额查询
+//     */
+//    @GetMapping("/{userTradeAmt}")
+//    public R userTradeAmt(@RequestParam("userCode") String userCode) {
+//        return R.ok(kxsUserService.getByUserCode(userCode));
+//    }
+//
+//
+//    /**
+//     * 创客信息-直属创客交易额
+//     *
+//     * @param page 分页对象
+//     * @param param 查询实体
+//     * @return 创客信息-直属创客交易额
+//     */
+//    @GetMapping("/teamTradeAmt")
+//    public R teamTradeAmt(Page<SysUserTeamTradeAmtVO> page, SysUserTeamTradeAmtDTO param) {
+//        return R.ok(kxsUserService.page(page, new QueryWrapper<>(param)));
+//    }
+
+
+
+
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysUserWithdrawalController.java

@@ -0,0 +1,45 @@
+package com.kxs.user.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
+import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
+import com.kxs.user.biz.service.KxsUserWithdrawalService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 创客信息管理(SysUserWithdrawal)控制层
+ *
+ * @author 系统
+ * @since 2024-06-24 09:30:02
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysUserWithdrawal")
+public class SysUserWithdrawalController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsUserWithdrawalService kxsUserWithdrawalService;
+
+
+
+    /**
+     * 创客提现管理
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 创客提现管理
+     */
+    @GetMapping("/page")
+    public R userWithdrawalPage(Page<SysUserWithdrawalPageVO> page, SysUserWithdrawalPageDTO param) {
+        kxsUserWithdrawalService.userWithdrawalPage(page, param);
+        return R.ok(page);
+    }
+
+}
+

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserAdvanceMapper.java

@@ -1,8 +1,15 @@
 package com.kxs.user.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
 import com.kxs.user.api.model.KxsUserAdvance;
+import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 客小爽用户预扣款表(KxsUserAdvance)表数据库访问层
@@ -13,5 +20,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsUserAdvanceMapper extends BaseMapper<KxsUserAdvance> {
 
+    /**
+     * 分页查询用户预扣款
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserAdvancePageVO> userAdvancePage(Page page, @Param("query")SysUserAdvancePageDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserMapper.java

@@ -1,14 +1,22 @@
 package com.kxs.user.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kxs.user.api.dto.admin.user.SysUserLogoutListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserPageDTO;
+import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserWhereListDTO;
 import com.kxs.user.api.dto.kxsapp.user.UserMyUserListDTO;
 import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.vo.admin.user.SysUserWhereListVO;
 import com.kxs.user.api.vo.kxsapp.user.RealUserInfoVO;
 import com.kxs.user.api.vo.kxsapp.user.UserMyUserListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.List;
+
 /**
  * 用户表(KxsSecurityUser)表数据库访问层
  *
@@ -56,5 +64,38 @@ public interface KxsUserMapper extends BaseMapper<KxsUser> {
      * @return {@link Integer}
      */
     Integer selectMaxBeforeLevel(@Param("userId") Long userId);
+
+    /**
+     * 分页查询创客信息
+     * @param page 分页
+     * @param param 查询参数
+     * @return list
+     */
+    List<KxsUser> getUserPage(Page page, @Param("query") SysUserPageDTO param);
+
+    /**
+     * 分页查询上下级创客信息
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserWhereListVO> getUserWhereList(Page page, @Param("query") SysUserWhereListDTO param);
+
+    /**
+     * 分页查询已注销创客
+     * @param page 分页
+     * @param param 查询参数
+     * @return list
+     */
+    List<KxsUser> getLogoutListPage(Page page, @Param("query") SysUserLogoutListDTO param);
+
+
+    /**
+     * 分页查询用户账号信息
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserWhereListVO> userAccountPage(Page page, @Param("query")SysUserUserAccountListDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/mapper/KxsUserWithdrawalMapper.java

@@ -3,9 +3,15 @@ package com.kxs.user.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.model.KxsUserWithdrawal;
+import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户提现申请表(KxsUserWithdrawal)表数据库访问层
@@ -17,5 +23,13 @@ import org.apache.ibatis.annotations.Mapper;
 public interface KxsUserWithdrawalMapper extends BaseMapper<KxsUserWithdrawal> {
 
     IPage<WithdrawListVO> getByPage(Page<WithdrawListVO> page);
+
+    /**
+     * 分页查询用户提现申请表
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserWithdrawalPageVO> userAccountPage (Page page, @Param("query") SysUserWithdrawalPageDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserAdvanceService.java

@@ -1,8 +1,14 @@
 package com.kxs.user.biz.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
 import com.kxs.user.api.model.KxsUserAdvance;
+import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
+
+import java.util.List;
 
 /**
  * 客小爽用户预扣款表(KxsUserAdvance)表服务接口
@@ -19,5 +25,13 @@ public interface KxsUserAdvanceService extends IService<KxsUserAdvance> {
      * @return {@link R}
      */
     R returnAdvance(Integer advanceId);
+
+    /**
+     * 预设职级列表查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserAdvancePageVO> userAdvancePage(Page page, SysUserAdvancePageDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserService.java

@@ -1,14 +1,22 @@
 package com.kxs.user.biz.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.common.core.constant.enums.UserStatusEnum;
 import com.kxs.common.core.util.R;
 import com.kxs.product.api.vo.kxsapp.excel.ExistPayPwdVO;
+import com.kxs.user.api.dto.admin.user.RestPwdDTO;
+import com.kxs.user.api.dto.admin.user.SysUserLogoutListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserPageDTO;
+import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserWhereListDTO;
 import com.kxs.user.api.dto.kxsapp.ConcealParentDTO;
 import com.kxs.user.api.dto.kxsapp.app.ForgetPwdDTO;
 import com.kxs.user.api.dto.kxsapp.app.MchRegisterDTO;
 import com.kxs.user.api.dto.kxsapp.app.RegisterDTO;
 import com.kxs.user.api.dto.kxsapp.user.*;
 import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.vo.admin.user.SysUserWhereListVO;
 import com.kxs.user.api.vo.kxsapp.user.RealUserInfoVO;
 import com.kxs.user.api.vo.kxsapp.user.UserCodeInfoVO;
 import com.kxs.user.api.vo.kxsapp.user.UserInfoVO;
@@ -277,5 +285,50 @@ public interface KxsUserService extends IService<KxsUser> {
      */
     R mchRegister(MchRegisterDTO registerDTO);
 
+    /**
+     * 分页查询创客列表
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsUser> getUserPage(Page page, SysUserPageDTO param);
+
+    /**
+     * 分页查询创客上下级列表
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserWhereListVO> getUserWhereList(Page page, SysUserWhereListDTO param);
+
+    /**
+     * 分页查询已注销创客
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsUser> getLogoutListPage(Page page, SysUserLogoutListDTO param);
+
+    /**
+     * 更新用户状态（注销，锁定）
+     * @param userId
+     */
+    void updateStatusByUserId(String userId, UserStatusEnum userStatusEnum);
+
+    /**
+     * 批量更新用户状态（注销，锁定）
+     * @param userIdList
+     * @param userStatusEnum
+     */
+    void updateStatusByUserIds(List<String> userIdList, UserStatusEnum userStatusEnum);
+
+    /**
+     * 重置密码
+     * @param param
+     */
+    void restPwd(RestPwdDTO param);
+
+    List<SysUserWhereListVO> userAccountPage(Page page, SysUserUserAccountListDTO param);
+
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserWithdrawalService.java

@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.dto.kxsapp.userAccount.WithdrawDepositDTO;
 import com.kxs.user.api.model.KxsUserWithdrawal;
+import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawDetailVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 
+import java.util.List;
+
 /**
  * 用户提现申请表(KxsUserWithdrawal)表服务接口
  *
@@ -41,5 +45,13 @@ public interface KxsUserWithdrawalService extends IService<KxsUserWithdrawal> {
      * @return {@link WithdrawDetailVO}
      */
     WithdrawDetailVO withdrawDetail(Integer id);
+
+    /**
+     * 创客提现管理分页查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysUserWithdrawalPageVO> userWithdrawalPage(Page page, SysUserWithdrawalPageDTO param);
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAdvanceServiceImpl.java

@@ -1,14 +1,18 @@
 package com.kxs.user.biz.service.impl;
 
 import cn.hutool.core.util.NumberUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.enums.AmountLogChangeTypesEnum;
 import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.common.core.util.R;
+import com.kxs.user.api.dto.admin.user.SysUserAdvancePageDTO;
 import com.kxs.user.api.model.KxsUserAmount;
 import com.kxs.common.core.constant.enums.UserAdvanceStatusEnum;
 import com.kxs.user.api.model.KxsUserAmountLog;
+import com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO;
 import com.kxs.user.biz.mapper.KxsUserAdvanceMapper;
 import com.kxs.user.api.model.KxsUserAdvance;
 import com.kxs.user.biz.mapper.KxsUserAmountMapper;
@@ -20,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 客小爽用户预扣款表(KxsUserAdvance)表服务实现类
@@ -58,5 +63,14 @@ public class KxsUserAdvanceServiceImpl extends ServiceImpl<KxsUserAdvanceMapper,
         kxsUserAmountService.userAmountChange(userAmountLog);
         return R.ok();
     }
+
+    @Override
+    public List<SysUserAdvancePageVO> userAdvancePage(Page page, SysUserAdvancePageDTO param) {
+        List<SysUserAdvancePageVO> list = baseMapper.userAdvancePage(page, param);
+        if (page != null) {
+            page.setRecords(list);
+        }
+        return list;
+    }
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -1,14 +1,15 @@
 package com.kxs.user.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.CacheConstants;
@@ -30,12 +31,18 @@ import com.kxs.store.api.model.KxsWarehouseLimit;
 import com.kxs.system.api.feign.RemoteUserMsgService;
 import com.kxs.system.api.model.KxsUserMsg;
 import com.kxs.system.api.util.MsgTemplateUtil;
+import com.kxs.user.api.dto.admin.user.RestPwdDTO;
+import com.kxs.user.api.dto.admin.user.SysUserLogoutListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserPageDTO;
+import com.kxs.user.api.dto.admin.user.SysUserUserAccountListDTO;
+import com.kxs.user.api.dto.admin.user.SysUserWhereListDTO;
 import com.kxs.user.api.dto.kxsapp.ConcealParentDTO;
 import com.kxs.user.api.dto.kxsapp.app.ForgetPwdDTO;
 import com.kxs.user.api.dto.kxsapp.app.MchRegisterDTO;
 import com.kxs.user.api.dto.kxsapp.app.RegisterDTO;
 import com.kxs.user.api.dto.kxsapp.user.*;
 import com.kxs.user.api.model.*;
+import com.kxs.user.api.vo.admin.user.SysUserWhereListVO;
 import com.kxs.user.api.vo.kxsapp.user.*;
 import com.kxs.user.api.vo.kxsapp.userLevel.LevelDetailVO;
 import com.kxs.user.api.vo.kxsapp.userLevel.LevelsVO;
@@ -48,7 +55,7 @@ import com.kxs.user.biz.service.KxsUserService;
 import com.kxs.user.biz.util.SmsUtils;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.K;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.CacheManager;
@@ -71,7 +78,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * 用户表(KxsSecurityUser)表服务实现类
@@ -267,6 +273,92 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         return R.ok();
     }
 
+    @Override
+    public List<KxsUser> getUserPage(Page page, SysUserPageDTO param) {
+        List<KxsUser> list = baseMapper.getUserPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    @Override
+    public List<SysUserWhereListVO> getUserWhereList(Page page, SysUserWhereListDTO param) {
+        String userId = param.getUserId();
+        KxsUser kxsUser = getById(userId);
+        if(kxsUser == null){
+            throw new GlobalCustomerException("创客信息不存在");
+        }
+        param.setPid(kxsUser.getPid());
+        List<SysUserWhereListVO> list = baseMapper.getUserWhereList(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    @Override
+    public List<KxsUser> getLogoutListPage(Page page, SysUserLogoutListDTO param) {
+        List<KxsUser> list = baseMapper.getLogoutListPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    @Override
+    public void updateStatusByUserId(String userId,UserStatusEnum userStatusEnum) {
+        KxsUser kxsUser = getById(userId);
+        if(kxsUser == null){
+            throw new GlobalCustomerException("创客信息不存在");
+        }
+        kxsUser.setStatus(UserStatusEnum.REMOVE.getCode());
+        updateById(kxsUser);
+    }
+
+    @Override
+    public void updateStatusByUserIds(List<String> userIdList,UserStatusEnum userStatusEnum) {
+        if(CollectionUtil.isNotEmpty(userIdList)){
+            List<KxsUser> kxsUsers = listByIds(userIdList);
+            if(CollectionUtil.isNotEmpty(kxsUsers)){
+                for(KxsUser kxsUser:kxsUsers){
+                    kxsUser.setStatus(userStatusEnum.getCode());
+                }
+                this.updateBatchById(kxsUsers);
+            }
+        }
+    }
+
+    @Override
+    public void restPwd(RestPwdDTO param) {
+        KxsUser kxsUser = getById(param.getUserId());
+        if(kxsUser == null){
+            throw new GlobalCustomerException("创客信息不存在");
+        }
+        String password = param.getPassword();
+        if(StringUtils.isBlank(password)){
+            password = "123456";
+        }
+        if(StringUtils.isBlank(kxsUser.getSalt())){
+            kxsUser.setSalt(UUID.randomUUID().toString());
+        }
+
+        //重置密码
+        kxsUser.setPassword(ENCODER.encode(password + kxsUser.getSalt()));
+
+        //保存新密码
+        this.updateById(kxsUser);
+    }
+
+    @Override
+    public List<SysUserWhereListVO> userAccountPage(Page page, SysUserUserAccountListDTO param) {
+        List<SysUserWhereListVO> list = baseMapper.userAccountPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
     @Override
     public Boolean sendCode(String mobile) {
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserWithdrawalServiceImpl.java

@@ -12,9 +12,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.user.api.dto.admin.user.SysUserWithdrawalPageDTO;
 import com.kxs.user.api.dto.kxsapp.userAccount.WithdrawDepositDTO;
 import com.kxs.user.api.model.KxsUserAmount;
 import com.kxs.user.api.model.KxsUserBank;
+import com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawDetailVO;
 import com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO;
 import com.kxs.user.biz.constant.enums.UserErrorTypeEnum;
@@ -31,6 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 用户提现申请表(KxsUserWithdrawal)表服务实现类
@@ -164,19 +167,14 @@ public class KxsUserWithdrawalServiceImpl extends ServiceImpl<KxsUserWithdrawalM
         return detailVO;
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+    @Override
+    public List<SysUserWithdrawalPageVO> userWithdrawalPage(Page page, SysUserWithdrawalPageDTO param) {
+        List<SysUserWithdrawalPageVO> list = baseMapper.userAccountPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
 
 
 }

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserAdvanceMapper.xml

@@ -19,4 +19,36 @@
 
     </resultMap>
 
+    <resultMap id="WebKxsUserAdvanceMap" type="com.kxs.user.api.vo.admin.user.SysUserAdvancePageVO" extends="KxsUserAdvanceMap">
+        <result column="user_code" property="userCode" />
+        <result column="username" property="username" />
+        <result column="phone" property="phone" />
+    </resultMap>
+
+    <select id="userAdvancePage" resultMap="WebKxsUserAdvanceMap">
+        SELECT
+            kua.*,
+            ku.user_code,
+            ku.username,
+            ku.phone
+        FROM
+            kxs_user_advance kua
+            LEFT JOIN kxs_user ku ON kua.user_id = ku.id
+        <where>
+            <if test="query.username != null and query.username != ''">
+                <bind name="usernameLike" value="'%'+query.username+'%'"/>
+                AND ku.username LIKE #{usernameLike}
+            </if>
+            <if test="query.advanceType != null">
+                and kua.advance_type = #{query.advanceType}
+            </if>
+            <if test="query.status != null">
+                and kua.status = #{status}
+            </if>
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+    </select>
 </mapper>

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserMapper.xml

@@ -28,6 +28,18 @@
         <result column="create_time" property="createTime"/>
         <result column="to_merchant_maker_time" property="toMerchantMakerTime"/>
     </resultMap>
+    
+    <resultMap id="WebKxsUserMap" extends="KxsUserMap" type="com.kxs.user.api.vo.admin.user.SysUserWhereListVO">
+        <result column="realTime" property="realTime"/>
+        <result column="pUsername" property="pUsername"/>
+        <result column="pUserCode" property="pUserCode"/>
+        <result column="isLeader" property="isLeader"/>
+        <result column="isPartner" property="isPartner"/>
+    </resultMap>
+
+    <resultMap id="AccountKxsUserMap" extends="KxsUserMap" type="com.kxs.user.api.vo.admin.user.SysUserUserAccountListVO">
+        <result column="amount" property="amount"/>
+    </resultMap>
     <select id="findUserRealBankInfo" resultType="com.kxs.user.api.vo.kxsapp.user.RealUserInfoVO">
         select a.phone, a.user_code, r.real_name, r.id_card, b.bank_name, b.bank_open, b.bank_phone, b.bank_code
         from kxs_user a
@@ -105,6 +117,125 @@
         </if>
     </select>
 
+    <select id="getUserPage" resultMap="KxsUserMap">
+        select DISTINCT ku.* from kxs_user ku
+        left join kxs_user_real kur on ku.id = kur.user_id
+        <where>
+            and ku.del_flag != 1
+            <if test="query.username != null and query.username != ''">
+                <bind name="usernameLike" value="'%'+query.username+'%'"/>
+                AND ku.username LIKE #{usernameLike}
+            </if>
+            <if test="query.idCard != null and query.idCard != ''">
+                <bind name="idCardLike" value="'%'+query.idCard+'%'"/>
+                AND kur.id_card LIKE #{idCardLike}
+            </if>
+            <if test="query.phone != null and query.phone != ''">
+                <bind name="phoneLike" value="'%'+query.phone+'%'"/>
+                AND ku.phone LIKE #{phoneLike}
+            </if>
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+    </select>
+
+    <select id="getUserWhereList" resultMap="WebKxsUserMap">
+        SELECT
+            ku.id,
+            ku.create_time,
+            ku.username,
+            ku.phone,
+            ku.user_code,
+            ku.user_level,
+            ku.STATUS,
+            ku.is_merchant_maker,
+            kur.create_time AS realTime,
+            p_ku.username AS pUsername,
+            p_ku.user_code AS pUserCode,
+            IF( kl.user_id IS NOT NULL, 1, 0 ) AS isLeader,
+            IF( kp.user_id IS NOT NULL, 1, 0 ) AS isPartner
+        FROM
+            kxs_user ku
+            LEFT JOIN kxs_user_real kur ON ku.id = kur.user_id and kur.del_flag = 0
+            LEFT JOIN kxs_user p_ku ON ku.pid = p_ku.id and p_ku.del_flag = 0
+            LEFT JOIN kxs_leader kl ON ku.id = kl.user_id and kl.del_flag = 0
+            LEFT JOIN kxs_partner kp ON ku.id = kp.user_id  and kp.del_flag = 0
+        <where>
+            and ku.del_flag != 1
+            <if test="query.queryType != null and query.queryType != ''">
+                <choose>
+                    <when test="query.queryType == '1'">
+                        <if test="query.userId != null and query.userId != ''">
+                            AND ku.pid = #{query.userId}
+                        </if>
+                    </when>
+                    <when test="query.queryType == '0'">
+                        <if test="query.pid != null and query.pid != ''">
+                            AND ku.id = #{pid}
+                        </if>
+                    </when>
+                </choose>
+            </if>
+        </where>
+        order by ku.create_time
+    </select>
+
+    <select id="getLogoutListPage" resultMap="KxsUserMap">
+        select DISTINCT ku.* from kxs_user ku
+        left join kxs_user_real kur on ku.id = kur.user_id
+        <where>
+            and ku.del_flag != 1 and ku.status = 0
+            <if test="query.username != null and query.username != ''">
+                <bind name="usernameLike" value="'%'+query.username+'%'"/>
+                AND ku.username LIKE #{usernameLike}
+            </if>
+            <if test="query.idCard != null and query.idCard != ''">
+                <bind name="idCardLike" value="'%'+query.idCard+'%'"/>
+                AND kur.id_card LIKE #{idCardLike}
+            </if>
+            <if test="query.phone != null and query.phone != ''">
+                <bind name="phoneLike" value="'%'+query.phone+'%'"/>
+                AND ku.phone LIKE #{phoneLike}
+            </if>
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+    </select>
+
+    <select id="userAccountPage" resultMap="AccountKxsUserMap">
+        SELECT
+            ku.username,
+            ku.phone,
+            ku.user_code,
+            ku.remark,
+            ku.update_time,
+            kua.amount,
+            ku.status
+        FROM
+            kxs_user ku
+            LEFT JOIN kxs_user_amount kua ON ku.id = kua.user_id
+        <where>
+            and ku.del_flag != 1
+            <if test="query.username != null and query.username != ''">
+                <bind name="usernameLike" value="'%'+query.username+'%'"/>
+                AND ku.username LIKE #{usernameLike}
+            </if>
+            <if test="query.phone != null and query.phone != ''">
+                <bind name="phoneLike" value="'%'+query.phone+'%'"/>
+                AND ku.phone LIKE #{phoneLike}
+            </if>
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+        order by ku.create_time
+    </select>
+
 
 </mapper>
 

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserWithdrawalMapper.xml

@@ -24,6 +24,12 @@
         <result column="withdrawal_type" property="withdrawalType" />
 
     </resultMap>
+
+    <resultMap id="WebKxsUserWithdrawalMap" extends="KxsUserWithdrawalMap" type="com.kxs.user.api.vo.admin.user.SysUserWithdrawalPageVO">
+        <result column="user_code" property="userCode" />
+        <result column="username" property="username" />
+        <result column="id_card" property="idCard" />
+    </resultMap>
     <select id="getByPage" resultType="com.kxs.user.api.vo.kxsapp.userAccount.WithdrawListVO">
         select a.*, CONCAT(a.bank_name,'(', a.bank_code,')') as title  from kxs_user_withdrawal a
         <where>
@@ -32,4 +38,31 @@
         order by  a.create_time desc
     </select>
 
+    <select id="userAccountPage" resultMap="WebKxsUserWithdrawalMap">
+        SELECT
+            kuw.*,
+            ku.user_code,
+            ku.username,
+            kur.id_card
+        FROM
+            kxs_user_withdrawal kuw
+            LEFT JOIN kxs_user ku ON kuw.user_id = ku.id
+            LEFT JOIN kxs_user_real kur ON kuw.user_id = kur.user_id
+        <where>
+            <if test="query.applyNo != null and query.applyNo != ''">
+                <bind name="applyNoLike" value="'%'+query.applyNo+'%'"/>
+                AND kuw.apply_no LIKE #{applyNoLike}
+            </if>
+            <if test="query.username != null and query.username != ''">
+                <bind name="usernameLike" value="'%'+query.username+'%'"/>
+                AND ku.username LIKE #{usernameLike}
+            </if>
+            <if test="query.userCode != null and query.userCode != ''">
+                <bind name="userCodeLike" value="'%'+query.userCode+'%'"/>
+                AND ku.user_code LIKE #{userCodeLike}
+            </if>
+        </where>
+        ORDER BY
+            kuw.create_time
+    </select>
 </mapper>