From e90d9dd5ca5bc108718cdff9b9174c9ec24a0451 Mon Sep 17 00:00:00 2001 From: khy <2908249413@qq.com> Date: Thu, 24 Oct 2024 09:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AE=B0=E5=BD=95=EF=BC=88?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/member/memberuser/index.ts | 79 ++++++ yudao-admin-vue3/src/api/member/type/index.ts | 5 + yudao-admin-vue3/src/utils/dict.ts | 4 + .../member/memberuser/PaidMemberUserForm.vue | 195 +++++++++++++++ .../src/views/member/memberuser/index.vue | 226 ++++++++++++++++++ .../PaidMemberCardTypeController.java | 7 + .../admin/user/PaidMemberUserController.java | 95 ++++++++ .../user/vo/PaidMemberUserPageReqVO.java | 112 +++++++++ .../admin/user/vo/PaidMemberUserRespVO.java | 130 ++++++++++ .../dal/mysql/user/PaidMemberUserMapper.java | 9 + .../PaidMemberCardTypeService.java | 2 + .../PaidMemberCardTypeServiceImpl.java | 7 + .../service/user/PaidMemberUserService.java | 14 +- .../user/PaidMemberUserServiceImpl.java | 9 +- 14 files changed, 883 insertions(+), 11 deletions(-) create mode 100644 yudao-admin-vue3/src/api/member/memberuser/index.ts create mode 100644 yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue create mode 100644 yudao-admin-vue3/src/views/member/memberuser/index.vue create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/PaidMemberUserController.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java diff --git a/yudao-admin-vue3/src/api/member/memberuser/index.ts b/yudao-admin-vue3/src/api/member/memberuser/index.ts new file mode 100644 index 0000000..f52d44b --- /dev/null +++ b/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 }) + }, +} diff --git a/yudao-admin-vue3/src/api/member/type/index.ts b/yudao-admin-vue3/src/api/member/type/index.ts index f473c73..967bc05 100644 --- a/yudao-admin-vue3/src/api/member/type/index.ts +++ b/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`}) + }, } diff --git a/yudao-admin-vue3/src/utils/dict.ts b/yudao-admin-vue3/src/utils/dict.ts index 98cea3c..69bdbad 100644 --- a/yudao-admin-vue3/src/utils/dict.ts +++ b/yudao-admin-vue3/src/utils/dict.ts @@ -195,6 +195,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',//积分商品状态 diff --git a/yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue b/yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue new file mode 100644 index 0000000..2374033 --- /dev/null +++ b/yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue @@ -0,0 +1,195 @@ + + \ No newline at end of file diff --git a/yudao-admin-vue3/src/views/member/memberuser/index.vue b/yudao-admin-vue3/src/views/member/memberuser/index.vue new file mode 100644 index 0000000..2b95c1f --- /dev/null +++ b/yudao-admin-vue3/src/views/member/memberuser/index.vue @@ -0,0 +1,226 @@ + + + diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/membercardtype/PaidMemberCardTypeController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/membercardtype/PaidMemberCardTypeController.java index 0a50621..cc21c17 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/membercardtype/PaidMemberCardTypeController.java +++ b/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> getcardlist() { + List card = cardTypeService.getOpenType(); + return success(card); + } + @GetMapping("/page") @Operation(summary = "获得会员卡类型分页") @PreAuthorize("@ss.hasPermission('member:paid-member-card-type:query')") diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/PaidMemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/PaidMemberUserController.java new file mode 100644 index 0000000..3cfe98c --- /dev/null +++ b/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 createPaidMemberUser(@Valid @RequestBody PaidMemberUserSaveReqVO createReqVO) { + return success(paidMemberUserService.createMemberUser(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新付费会员") + @PreAuthorize("@ss.hasPermission('member:paid-member-user:update')") + public CommonResult 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 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 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> getPaidMemberUserPage(@Valid PaidMemberUserPageReqVO pageReqVO) { + PageResult 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 list = paidMemberUserService.getMemberUserPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "付费会员.xls", "数据", PaidMemberUserRespVO.class, + BeanUtils.toBean(list, PaidMemberUserRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java new file mode 100644 index 0000000..f835b38 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java new file mode 100644 index 0000000..be206c3 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java index db4da9a..7efbc26 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java +++ b/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 { + default PageResult selectPage(PaidMemberUserPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .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)); + } } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeService.java index f6c27c2..0897d1c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeService.java +++ b/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 getOpenType(); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeServiceImpl.java index 7f2fa99..0965a08 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/membercardtype/PaidMemberCardTypeServiceImpl.java +++ b/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 getOpenType() { + Integer status = 1; + List list = cardMapper.selectListByStatus(status); + return list; + } + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java index e10025f..16c4969 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java +++ b/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 getMemberUserPage(PaidMemberUserPageReqVO pageReqVO); + /** + * 获得会员分页 + * + * @param pageReqVO 分页查询 + * @return 会员分页 + */ + PageResult getMemberUserPage(PaidMemberUserPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java index 6e2c121..304b55e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java +++ b/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 getMemberUserPage(PaidMemberUserPageReqVO pageReqVO) { -// return memberUserMapper.selectPage(pageReqVO); -// } + + @Override + public PageResult getMemberUserPage(PaidMemberUserPageReqVO pageReqVO) { + return paidMemberUserMapper.selectPage(pageReqVO); + } } \ No newline at end of file