Merge pull request '会员记录（后台）' (#70) from khy1 into master

Reviewed-on: #70

yudao-admin-vue3/src/api/member/memberuser/index.ts

@@ -0,0 +1,79 @@
+import request from '@/config/axios'
+
+// 付费会员 VO
+export interface PaidMemberUserVO {
+  id: number // 编号
+  mobile: string // 手机号
+  password: string // 密码
+  status: number // 状态
+  registerIp: string // 注册 IP
+  registerTerminal: number // 注册终端
+  loginIp: string // 最后登录IP
+  loginDate: Date // 最后登录时间
+  nickname: string // 用户昵称
+  avatar: string // 头像
+  name: string // 真实名字
+  sex: number // 性别
+  birthday: Date // 出生日期
+  areaId: number // 所在地
+  mark: string // 用户备注
+  point: number // 积分
+  tagIds: string // 用户标签编号列表,以逗号分隔
+  levelId: number // 等级编号
+  experience: number // 经验
+  groupId: number // 用户分组编号
+
+  paid: Boolean //是否支付,0:未支付，1:已支付
+
+  payTime: Date //支付时间
+
+  cardExpirationTime: Date; //到期时间
+
+  price:number //支付金额，单位为分
+
+  deadlineDay:string //期限天数
+
+  payType: string //支付方式
+
+
+  payChannel: string//支付渠道
+
+  orderNo: string //订单号
+
+   payOrderId: number //支付订单编号
+
+  payMemberType: string//会员类型
+}
+
+// 付费会员 API
+export const PaidMemberUserApi = {
+  // 查询付费会员分页
+  getPaidMemberUserPage: async (params: any) => {
+    return await request.get({ url: `/member/paid-member-user/page`, params })
+  },
+
+  // 查询付费会员详情
+  getPaidMemberUser: async (id: number) => {
+    return await request.get({ url: `/member/paid-member-user/get?id=` + id })
+  },
+
+  // 新增付费会员
+  createPaidMemberUser: async (data: PaidMemberUserVO) => {
+    return await request.post({ url: `/member/paid-member-user/create`, data })
+  },
+
+  // 修改付费会员
+  updatePaidMemberUser: async (data: PaidMemberUserVO) => {
+    return await request.put({ url: `/member/paid-member-user/update`, data })
+  },
+
+  // 删除付费会员
+  deletePaidMemberUser: async (id: number) => {
+    return await request.delete({ url: `/member/paid-member-user/delete?id=` + id })
+  },
+
+  // 导出付费会员 Excel
+  exportPaidMemberUser: async (params) => {
+    return await request.download({ url: `/member/paid-member-user/export-excel`, params })
+  },
+}

yudao-admin-vue3/src/api/member/type/index.ts

@@ -42,4 +42,9 @@ export const cardApi = {
   exportcard: async (params) => {
     return await request.download({ url: `/paid/member/card/type/export-excel`, params })
   },
+
+  // 获取会员卡类型下拉列表
+  getcardlist: async () => {
+    return await request.get({ url: `/paid/member/card/type/get-list`})
+  },
 }

yudao-admin-vue3/src/utils/dict.ts

@@ -212,6 +212,10 @@ export enum DICT_TYPE {
   MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
   MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
 
+  PAID_MEMBER_USER_PAID = 'paid_member_user_paid', //付费会员支付状态
+
+  MEMBER_USER_PAY_TYPE = 'member_user_pay_type',// 会员记录支付方式
+
   // ========== MALL - 商品模块 ==========
   PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
   POINT_PRODUCT_STATUS='point_product_status',//积分商品状态

yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue

@@ -0,0 +1,195 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="formData.mobile" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="formData.password" placeholder="请输入密码" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="注册 IP" prop="registerIp">
+        <el-input v-model="formData.registerIp" placeholder="请输入注册 IP" />
+      </el-form-item>
+      <el-form-item label="注册终端" prop="registerTerminal">
+        <el-input v-model="formData.registerTerminal" placeholder="请输入注册终端" />
+      </el-form-item>
+      <el-form-item label="最后登录IP" prop="loginIp">
+        <el-input v-model="formData.loginIp" placeholder="请输入最后登录IP" />
+      </el-form-item>
+      <el-form-item label="最后登录时间" prop="loginDate">
+        <el-date-picker
+          v-model="formData.loginDate"
+          type="date"
+          value-format="x"
+          placeholder="选择最后登录时间"
+        />
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickname">
+        <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+      </el-form-item>
+      <el-form-item label="头像" prop="avatar">
+        <el-input v-model="formData.avatar" placeholder="请输入头像" />
+      </el-form-item>
+      <el-form-item label="真实名字" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入真实名字" />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-radio-group v-model="formData.sex">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker
+          v-model="formData.birthday"
+          type="date"
+          value-format="x"
+          placeholder="选择出生日期"
+        />
+      </el-form-item>
+      <el-form-item label="所在地" prop="areaId">
+        <el-input v-model="formData.areaId" placeholder="请输入所在地" />
+      </el-form-item>
+      <el-form-item label="用户备注" prop="mark">
+        <el-input v-model="formData.mark" placeholder="请输入用户备注" />
+      </el-form-item>
+      <el-form-item label="积分" prop="point">
+        <el-input v-model="formData.point" placeholder="请输入积分" />
+      </el-form-item>
+      <el-form-item label="用户标签编号列表,以逗号分隔" prop="tagIds">
+        <el-input v-model="formData.tagIds" placeholder="请输入用户标签编号列表,以逗号分隔" />
+      </el-form-item>
+      <el-form-item label="等级编号" prop="levelId">
+        <el-input v-model="formData.levelId" placeholder="请输入等级编号" />
+      </el-form-item>
+      <el-form-item label="经验" prop="experience">
+        <el-input v-model="formData.experience" placeholder="请输入经验" />
+      </el-form-item>
+      <el-form-item label="用户分组编号" prop="groupId">
+        <el-input v-model="formData.groupId" placeholder="请输入用户分组编号" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { PaidMemberUserApi, PaidMemberUserVO } from '@/api/member/memberuser'
+
+/** 付费会员 表单 */
+defineOptions({ name: 'PaidMemberUserForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  mobile: undefined,
+  password: undefined,
+  status: undefined,
+  registerIp: undefined,
+  registerTerminal: undefined,
+  loginIp: undefined,
+  loginDate: undefined,
+  nickname: undefined,
+  avatar: undefined,
+  name: undefined,
+  sex: undefined,
+  birthday: undefined,
+  areaId: undefined,
+  mark: undefined,
+  point: undefined,
+  tagIds: undefined,
+  levelId: undefined,
+  experience: undefined,
+  groupId: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await PaidMemberUserApi.getPaidMemberUser(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PaidMemberUserVO
+    if (formType.value === 'create') {
+      await PaidMemberUserApi.createPaidMemberUser(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PaidMemberUserApi.updatePaidMemberUser(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    mobile: undefined,
+    password: undefined,
+    status: undefined,
+    registerIp: undefined,
+    registerTerminal: undefined,
+    loginIp: undefined,
+    loginDate: undefined,
+    nickname: undefined,
+    avatar: undefined,
+    name: undefined,
+    sex: undefined,
+    birthday: undefined,
+    areaId: undefined,
+    mark: undefined,
+    point: undefined,
+    tagIds: undefined,
+    levelId: undefined,
+    experience: undefined,
+    groupId: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

yudao-admin-vue3/src/views/member/memberuser/index.vue

@@ -0,0 +1,226 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="会员类型" prop="payMemberType">
+        <el-input
+          v-model="queryParams.payMemberType"
+          placeholder="请输入用户会员类型"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+<!--        <el-select v-model ="queryParams.payMemberType" placeholder="请选择会员类型">-->
+<!--          <el-option v-for ="item in cardlist"-->
+<!--                     :key="item.id"-->
+<!--                     :label="item.name"-->
+<!--                     :value="item.name"></el-option>-->
+<!--        </el-select>-->
+      </el-form-item>
+      <el-form-item label="支付方式" prop="payType">
+<!--        <el-input-->
+<!--          v-model="queryParams.payType"-->
+<!--          placeholder="请输入支付方式"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+        <el-select v-model="queryParams.payType" class="!w-240px" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_USER_PAY_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.label"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付时间" prop="payTime">
+        <el-date-picker
+          v-model="queryParams.payTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户名" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          placeholder="请输入用户昵称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="用户名" align="center" prop="nickname" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="会员类型" align="center" prop="payMemberType" />
+      <el-table-column label="是否支付" align="center" prop="paid">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAID_MEMBER_USER_PAID" :value="scope.row.paid"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期限(天)" align="center" prop="deadlineDay" />
+      <el-table-column label="支付金额(分)" align="center" prop="price" />
+      <el-table-column label="支付方式" align="center" prop="payType" />
+      <el-table-column
+        label="购买时间"
+        align="center"
+        prop="payTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PaidMemberUserForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PaidMemberUserApi, PaidMemberUserVO } from '@/api/member/memberuser'
+import * as CardApi from '@/api/member/type'
+import PaidMemberUserForm from './PaidMemberUserForm.vue'
+
+/** 付费会员 列表 */
+defineOptions({ name: 'PaidMemberUser' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PaidMemberUserVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  mobile: undefined,
+  password: undefined,
+  status: undefined,
+  registerIp: undefined,
+  registerTerminal: undefined,
+  loginIp: undefined,
+  loginDate: [],
+  nickname: undefined,
+  avatar: undefined,
+  name: undefined,
+  sex: undefined,
+  birthday: undefined,
+  birthday: [],
+  areaId: undefined,
+  mark: undefined,
+  point: undefined,
+  tagIds: undefined,
+  levelId: undefined,
+  experience: undefined,
+  groupId: undefined,
+  createTime: [],
+  paid: undefined,
+  payTime: [],
+  cardExpirationTime: [],
+  price: undefined,
+  deadlineDay:undefined,
+  payType: undefined,
+  payChannel: undefined,
+  orderNo: undefined,
+  payOrderId: undefined,
+  payMemberType: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PaidMemberUserApi.getPaidMemberUserPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PaidMemberUserApi.deletePaidMemberUser(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PaidMemberUserApi.exportPaidMemberUser(queryParams)
+    download.excel(data, '付费会员.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const cardlist = ref<CardApi.cardVO[]>([])//会员类型下拉列表
+/** 初始化 **/
+onMounted(async () => {
+ await getList()
+  cardlist.value = (await CardApi.getcardlist()) as CardApi.cardVO[]
+})
+</script>

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/membercardtype/PaidMemberCardTypeController.java

@@ -71,6 +71,13 @@ public class PaidMemberCardTypeController {
         return success(BeanUtils.toBean(card, PaidMemberCardTypeRespVO.class));
     }
 
+    @GetMapping("/get-list")
+    @Operation(summary = "获得会员卡类型下拉列表")
+    public CommonResult<List<PaidMemberCardTypeDO>> getcardlist() {
+        List<PaidMemberCardTypeDO> card = cardTypeService.getOpenType();
+        return success(card);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得会员卡类型分页")
     @PreAuthorize("@ss.hasPermission('member:paid-member-card-type:query')")

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/PaidMemberUserController.java

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.member.controller.admin.user;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.member.controller.admin.user.vo.*;
+import cn.iocoder.yudao.module.member.dal.dataobject.user.PaidMemberUserDO;
+import cn.iocoder.yudao.module.member.service.user.PaidMemberUserService;
+
+@Tag(name = "管理后台 - 付费会员")
+@RestController
+@RequestMapping("/member/paid-member-user")
+@Validated
+public class PaidMemberUserController {
+
+    @Resource
+    private PaidMemberUserService paidMemberUserService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建付费会员")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:create')")
+    public CommonResult<Long> createPaidMemberUser(@Valid @RequestBody PaidMemberUserSaveReqVO createReqVO) {
+        return success(paidMemberUserService.createMemberUser(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新付费会员")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:update')")
+    public CommonResult<Boolean> updatePaidMemberUser(@Valid @RequestBody PaidMemberUserSaveReqVO updateReqVO) {
+        paidMemberUserService.updateMemberUser(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除付费会员")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:delete')")
+    public CommonResult<Boolean> deletePaidMemberUser(@RequestParam("id") Long id) {
+        paidMemberUserService.deleteMemberUser(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得付费会员")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:query')")
+    public CommonResult<PaidMemberUserRespVO> getPaidMemberUser(@RequestParam("id") Long id) {
+        PaidMemberUserDO paidMemberUser = paidMemberUserService.getMemberUser(id);
+        return success(BeanUtils.toBean(paidMemberUser, PaidMemberUserRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得付费会员分页")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:query')")
+    public CommonResult<PageResult<PaidMemberUserRespVO>> getPaidMemberUserPage(@Valid PaidMemberUserPageReqVO pageReqVO) {
+        PageResult<PaidMemberUserDO> pageResult = paidMemberUserService.getMemberUserPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, PaidMemberUserRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出付费会员 Excel")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-user:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportPaidMemberUserExcel(@Valid PaidMemberUserPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<PaidMemberUserDO> list = paidMemberUserService.getMemberUserPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "付费会员.xls", "数据", PaidMemberUserRespVO.class,
+                        BeanUtils.toBean(list, PaidMemberUserRespVO.class));
+    }
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java

@@ -0,0 +1,112 @@
+package cn.iocoder.yudao.module.member.controller.admin.user.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 付费会员分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PaidMemberUserPageReqVO extends PageParam {
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "密码")
+    private String password;
+
+    @Schema(description = "状态", example = "1")
+    private Integer status;
+
+    @Schema(description = "注册 IP")
+    private String registerIp;
+
+    @Schema(description = "注册终端")
+    private Integer registerTerminal;
+
+    @Schema(description = "最后登录IP")
+    private String loginIp;
+
+    @Schema(description = "最后登录时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] loginDate;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickname;
+
+    @Schema(description = "头像")
+    private String avatar;
+
+    @Schema(description = "真实名字", example = "张三")
+    private String name;
+
+    @Schema(description = "性别")
+    private Integer sex;
+
+    @Schema(description = "出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "所在地", example = "18998")
+    private Integer areaId;
+
+    @Schema(description = "用户备注")
+    private String mark;
+
+    @Schema(description = "积分")
+    private Integer point;
+
+    @Schema(description = "用户标签编号列表,以逗号分隔")
+    private String tagIds;
+
+    @Schema(description = "等级编号", example = "27166")
+    private Long levelId;
+
+    @Schema(description = "经验")
+    private Integer experience;
+
+    @Schema(description = "用户分组编号", example = "27409")
+    private Long groupId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "是否支付", example = "0:未支付，1:已支付")
+    private Boolean paid;
+
+    @Schema(description = "支付时间", example = "2024-11-22 09:30:05")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] payTime;
+
+    @Schema(description = "到期时间", example = "2024-11-22 09:30:05")
+    private LocalDateTime cardExpirationTime;
+
+
+    @Schema(description = "支付金额，单位为分", example = "10")
+    private Integer price;
+
+    @Schema(description = "期限天数", example = "10")
+    private String deadlineDay ;
+
+    @Schema(description = "支付方式", example = "免费领取")
+    private String payType;
+
+    @Schema(description = "支付渠道", example = "public-公众号,mini-小程序，h5-网页支付,wechatIos-微信Ios，wechatAndroid-微信Android,alipay-支付包，alipayApp-支付宝App,give-平台赠送,yue-余额支付")
+    private String payChannel;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "支付订单编号")
+    private Long payOrderId;
+
+    @Schema(description = "会员类型")
+    private String payMemberType;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java

@@ -0,0 +1,130 @@
+package cn.iocoder.yudao.module.member.controller.admin.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 付费会员 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PaidMemberUserRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12209")
+    @ExcelProperty("编号")
+    private Long id;
+
+    @Schema(description = "手机号")
+    @ExcelProperty("手机号")
+    private String mobile;
+
+    @Schema(description = "密码")
+    @ExcelProperty("密码")
+    private String password;
+
+    @Schema(description = "状态", example = "1")
+    @ExcelProperty("状态")
+    private Integer status;
+
+    @Schema(description = "注册 IP")
+    @ExcelProperty("注册 IP")
+    private String registerIp;
+
+    @Schema(description = "注册终端")
+    @ExcelProperty("注册终端")
+    private Integer registerTerminal;
+
+    @Schema(description = "最后登录IP")
+    @ExcelProperty("最后登录IP")
+    private String loginIp;
+
+    @Schema(description = "最后登录时间")
+    @ExcelProperty("最后登录时间")
+    private LocalDateTime loginDate;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    @ExcelProperty("用户昵称")
+    private String nickname;
+
+    @Schema(description = "头像")
+    @ExcelProperty("头像")
+    private String avatar;
+
+    @Schema(description = "真实名字", example = "张三")
+    @ExcelProperty("真实名字")
+    private String name;
+
+    @Schema(description = "性别")
+    @ExcelProperty("性别")
+    private Integer sex;
+
+    @Schema(description = "出生日期")
+    @ExcelProperty("出生日期")
+    private LocalDateTime birthday;
+
+    @Schema(description = "所在地", example = "18998")
+    @ExcelProperty("所在地")
+    private Integer areaId;
+
+    @Schema(description = "用户备注")
+    @ExcelProperty("用户备注")
+    private String mark;
+
+    @Schema(description = "积分")
+    @ExcelProperty("积分")
+    private Integer point;
+
+    @Schema(description = "用户标签编号列表,以逗号分隔")
+    @ExcelProperty("用户标签编号列表,以逗号分隔")
+    private String tagIds;
+
+    @Schema(description = "等级编号", example = "27166")
+    @ExcelProperty("等级编号")
+    private Long levelId;
+
+    @Schema(description = "经验")
+    @ExcelProperty("经验")
+    private Integer experience;
+
+    @Schema(description = "用户分组编号", example = "27409")
+    @ExcelProperty("用户分组编号")
+    private Long groupId;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "是否支付", example = "0:未支付，1:已支付")
+    private Boolean paid;
+
+    @Schema(description = "支付时间", example = "2024-11-22 09:30:05")
+    private LocalDateTime payTime;
+
+    @Schema(description = "到期时间", example = "2024-11-22 09:30:05")
+    private LocalDateTime cardExpirationTime;
+
+
+    @Schema(description = "支付金额，单位为分", example = "10")
+    private Integer price;
+
+    @Schema(description = "期限天数", example = "10")
+    private String deadlineDay ;
+
+    @Schema(description = "支付方式", example = "免费领取")
+    private String payType;
+
+    @Schema(description = "支付渠道", example = "public-公众号,mini-小程序，h5-网页支付,wechatIos-微信Ios，wechatAndroid-微信Android,alipay-支付包，alipayApp-支付宝App,give-平台赠送,yue-余额支付")
+    private String payChannel;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "支付订单编号")
+    private Long payOrderId;
+
+    @Schema(description = "会员类型")
+    private String payMemberType;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java

@@ -16,4 +16,13 @@ import cn.iocoder.yudao.module.member.controller.admin.user.vo.*;
  */
 @Mapper
 public interface PaidMemberUserMapper extends BaseMapperX<PaidMemberUserDO> {
+    default PageResult<PaidMemberUserDO> selectPage(PaidMemberUserPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PaidMemberUserDO>()
+                .eqIfPresent(PaidMemberUserDO::getPayMemberType,reqVO.getPayMemberType())
+                .eqIfPresent(PaidMemberUserDO::getPayType,reqVO.getPayType())
+                .betweenIfPresent(PaidMemberUserDO::getPayTime, reqVO.getPayTime())
+                .eqIfPresent(PaidMemberUserDO::getPaid,reqVO.getPaid())
+                .likeIfPresent(PaidMemberUserDO::getNickname,reqVO.getNickname())
+                .orderByDesc(PaidMemberUserDO::getId));
+    }
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeService.java

@@ -69,4 +69,6 @@ public interface PaidMemberCardTypeService {
      * 根据会员卡名查询
      */
     PaidMemberCardTypeDO selectByName(String cardName);
+
+    List<PaidMemberCardTypeDO> getOpenType();
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeServiceImpl.java

@@ -100,5 +100,12 @@ public class PaidMemberCardTypeServiceImpl implements PaidMemberCardTypeService
         return paidMemberCardTypeDO;
     }
 
+    @Override
+    public List<PaidMemberCardTypeDO> getOpenType() {
+        Integer status = 1;
+        List<PaidMemberCardTypeDO> list = cardMapper.selectListByStatus(status);
+        return list;
+    }
+
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java

@@ -71,12 +71,12 @@ public interface PaidMemberUserService {
     PaidMemberUserDO getPaidMemberUserByUid(Long uid);
 
 
-//    /**
-//     * 获得会员分页
-//     *
-//     * @param pageReqVO 分页查询
-//     * @return 会员分页
-//     */
-//    PageResult<PaidMemberUserDO> getMemberUserPage(PaidMemberUserPageReqVO pageReqVO);
+    /**
+     * 获得会员分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 会员分页
+     */
+    PageResult<PaidMemberUserDO> getMemberUserPage(PaidMemberUserPageReqVO pageReqVO);
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java

@@ -164,9 +164,10 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
         PaidMemberUserDO paidMemberUserDO = list.get(0);
         return paidMemberUserDO;
     }
-//    @Override
-//    public PageResult<PaidMemberUserDO> getMemberUserPage(PaidMemberUserPageReqVO pageReqVO) {
-//        return memberUserMapper.selectPage(pageReqVO);
-//    }
+
+    @Override
+    public PageResult<PaidMemberUserDO> getMemberUserPage(PaidMemberUserPageReqVO pageReqVO) {
+        return paidMemberUserMapper.selectPage(pageReqVO);
+    }
 
 }