diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 194a33445..5a3f1e5e6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -1,5 +1,6 @@ package com.jsowell.web.controller.pile; +import cn.hutool.core.util.PageUtil; import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.google.common.collect.Lists; @@ -15,6 +16,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.dto.PlatformTesterDTO; +import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberPlateNumberRelationService; @@ -52,10 +54,10 @@ public class MemberBasicInfoController extends BaseController { */ @PreAuthorize("@ss.hasPermi('member:info:list')") @PostMapping("/list") - public TableDataInfo list(@RequestBody MemberBasicInfo memberBasicInfo) { - startPage(); + public TableDataInfo list(@RequestBody QueryMemberInfoDTO dto) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); // List list = memberBasicInfoService.selectMemberList(memberBasicInfo.getMobileNumber(), memberBasicInfo.getNickName()); - List list = memberBasicInfoService.selectMemberList(memberBasicInfo); + List list = memberBasicInfoService.selectMemberList(dto); return getDataTable(list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java new file mode 100644 index 000000000..5ce13fb36 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java @@ -0,0 +1,22 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * TODO + * + * @author Lemon + * @Date 2023/8/21 8:50 + */ +@Data +public class QueryMemberInfoDTO { + private Integer pageNum; + + private Integer pageSize; + + private String nickName; + + private String mobileNumber; + + private String memberId; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java index 960b8bb59..ff59eed22 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java @@ -2,6 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.PileBasicInfo; +import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import org.apache.ibatis.annotations.Param; @@ -107,9 +108,9 @@ public interface MemberBasicInfoMapper { /** * 查询会员基本信息列表 - * @param memberBasicInfo + * @param dto * @return */ - List selectMemberList(@Param("memberBasicInfo") MemberBasicInfo memberBasicInfo); + List selectMemberList(@Param("dto") QueryMemberInfoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index c3b96523b..5fb55678d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.PlatformTesterDTO; +import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.vo.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -106,10 +107,10 @@ public interface IMemberBasicInfoService { /** * 查询会员基本信息列表（后管用） - * @param memberBasicInfo + * @param dto * @return */ - List selectMemberList(MemberBasicInfo memberBasicInfo); + List selectMemberList(QueryMemberInfoDTO dto); List selectMemberList(String mobileNumber, String nickName); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 5da1f7f6a..18081af78 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.domain.MemberWalletLog; import com.jsowell.pile.dto.PlatformTesterDTO; +import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.mapper.MemberBasicInfoMapper; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; @@ -276,21 +277,21 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { */ @Override public List selectMemberList(String mobileNumber, String nickName) { - MemberBasicInfo memberBasicInfo = new MemberBasicInfo(); - memberBasicInfo.setMobileNumber(mobileNumber); - memberBasicInfo.setNickName(nickName); + QueryMemberInfoDTO dto = new QueryMemberInfoDTO(); + dto.setMobileNumber(mobileNumber); + dto.setNickName(nickName); - return selectMemberList(memberBasicInfo); + return selectMemberList(dto); } /** * 查询用户基本信息列表 - * @param memberBasicInfo + * @param dto * @return */ @Override - public List selectMemberList(MemberBasicInfo memberBasicInfo) { - return memberBasicInfoMapper.selectMemberList(memberBasicInfo); + public List selectMemberList(QueryMemberInfoDTO dto) { + return memberBasicInfoMapper.selectMemberList(dto); } /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index bafed2977..b6e3d362c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -209,9 +209,9 @@ JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0' where t1.del_flag = '0' - and t1.mobile_number like '%${memberBasicInfo.mobileNumber}%' - and t1.nick_name like '%${memberBasicInfo.nickName}%' - and t1.member_id like '%${memberBasicInfo.memberId}%' + and t1.mobile_number like '%${dto.mobileNumber}%' + and t1.nick_name like '%${dto.nickName}%' + and t1.member_id like '%${dto.memberId}%' diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue index f44f8d0e8..c6bb35af7 100644 --- a/jsowell-ui/src/views/member/info/index.vue +++ b/jsowell-ui/src/views/member/info/index.vue @@ -268,6 +268,8 @@ export default { getList() { this.loading = true; const params = { + pageNum: this.queryParams.pageNum, + pageSize: this.queryParams.pageSize, memberId: this.queryParams.memberId, nickName: this.queryParams.nickName, mobileNumber: this.queryParams.mobileNumber