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 b4698376f..57b55ab15 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 @@ -26,6 +26,7 @@ import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; +import com.jsowell.pile.vo.uniapp.MerchantVipVO; import com.jsowell.pile.vo.web.MemberTransactionVO; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; @@ -67,6 +68,15 @@ public class MemberBasicInfoController extends BaseController { return getDataTable(list); } + /** + * 查询运营商VIP列表 + */ + @PostMapping("/queryMerchantVipList") + public TableDataInfo queryMerchantVipList(@RequestBody QueryMemberInfoDTO dto) { + List list = memberBasicInfoService.queryMerchantVipList(dto); + return getDataTable(list); + } + /** * 获取当前会员表中存在的运营商列表 * http://localhost:8080/member/info/getMerchantListByAuth 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 7fb02f280..5a794f150 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 @@ -4,6 +4,7 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.MerchantVipVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -118,4 +119,5 @@ public interface MemberBasicInfoMapper { */ List getMerchantListByAuth(@Param("deptIds") List deptIds); + List queryMerchantVipList(@Param("merchantIdList") List merchantIdList); } 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 143ffa337..5e3b3f76a 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 @@ -4,10 +4,7 @@ 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.uniapp.MemberBalanceVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; @@ -148,4 +145,6 @@ public interface IMemberBasicInfoService { * @return */ List getMemberRefundAmount(List memberIds); + + List queryMerchantVipList(QueryMemberInfoDTO dto); } 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 77a794c00..9dd320b7f 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 @@ -27,10 +27,7 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; -import com.jsowell.pile.vo.uniapp.MemberBalanceVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; import lombok.extern.slf4j.Slf4j; @@ -481,4 +478,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return memberWalletLogMapper.getMemberRefundAmount(memberIds); } + @Override + public List queryMerchantVipList(QueryMemberInfoDTO dto) { + // 获取后管登录用户的权限 + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); + List merchantIdList = merchantInfoVOList.stream() + .map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); + List resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList); + + return resultList; + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java index beabfa2a3..0873bf8e3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java @@ -19,7 +19,7 @@ public class LoginUserDetailVO { private List firstMerchantIdList; /** - * 获取当前会员中的运营商列表 + * 获取当前登录用户中有权限的运营商列表 */ private List merchantInfoVOList; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java new file mode 100644 index 000000000..2ff63b5e7 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java @@ -0,0 +1,80 @@ +package com.jsowell.pile.vo.uniapp; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 运营商Vip VO + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class MerchantVipVO { + /** + * 会员Id + */ + private String memberId; + + private String merchantId; + + /** + * 运营商名称 + */ + private String merchantName; + + /** + * 状态 + */ + private String status; + + /** + * 昵称 + */ + private String nickName; + + /** + * 手机号码 + */ + private String mobileNumber; + + /** + * 钱包编号,前端也可以显示为卡号 + */ + private String walletCode; + + /** + * 本金金额 + */ + private BigDecimal principalBalance; + + /** + * 赠送金额 + */ + private BigDecimal giftBalance; + + /** + * 总账户余额 + */ + private BigDecimal totalAccountAmount; + + /** + * 车牌号 + */ + private List plateNumberList; + + /** + * VIN码 + */ + private List vinCodeList; + + /** + * 头像地址 + */ + private String avatarUrl; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index df5101d75..a62aff133 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -253,4 +253,24 @@ + + \ No newline at end of file diff --git a/jsowell-ui/src/api/member/info.js b/jsowell-ui/src/api/member/info.js index e0e2dff88..a1ed748bc 100644 --- a/jsowell-ui/src/api/member/info.js +++ b/jsowell-ui/src/api/member/info.js @@ -9,6 +9,15 @@ export function listInfo(data) { }) } +// 查询运营商VIP列表 +export function queryMerchantVipList(data) { + return request({ + url: '/member/info/queryMerchantVipList', + method: 'post', + data: data + }) +} + // 查询会员基础信息详细 export function getInfo(id) { return request({ diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue index 145f42171..246633e0a 100644 --- a/jsowell-ui/src/views/member/merchantVIP/index.vue +++ b/jsowell-ui/src/views/member/merchantVIP/index.vue @@ -75,6 +75,7 @@ + @@ -88,14 +89,15 @@ - + + + @@ -214,7 +217,7 @@ import { addInfo, updateInfo, updateMemberBalance, - getMerchantList, + getMerchantList, queryMerchantVipList, } from "@/api/member/info"; export default { @@ -277,7 +280,7 @@ export default { created() { this.getList(); - this.getMerchantList(); + // this.getMerchantList(); }, methods: { /** 查询会员基础信息列表 */ @@ -287,13 +290,10 @@ export default { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize, memberId: this.queryParams.memberId, - nickName: this.queryParams.nickName, mobileNumber: this.queryParams.mobileNumber, - merchantId: this.queryParams.merchantId, - vinCode: this.queryParams.vinCode, } console.log("params", params) - listInfo(params).then(response => { + queryMerchantVipList(params).then(response => { this.infoList = response.rows; console.log(this.infoList); this.total = response.total;