From 2c614ef306783965e74881a6dee901acb6e0049e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 18:16:30 +0800
Subject: [PATCH] 组合支付
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 37289ce..ed9d389 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -239,7 +239,7 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
- if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
+ if(mallMember.getReferrerId() != null && ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
if (referMember != null) {
mallMemberVo.setReferrerName(referMember.getName());
@@ -829,6 +829,41 @@
return new FebsResponse().success().data(apiMallAgentRecordVo);
}
+ @Override
+ public FebsResponse findMallRollPerkInPage(ApiMallRollPerkDto queryDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ Page<MallRollPerk> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ MallRollPerk mallRollPerk = new MallRollPerk();
+ if(ObjectUtil.isNotEmpty(queryDto.getState())){
+ mallRollPerk.setState(queryDto.getState());
+ }
+ mallRollPerk.setRollId(queryDto.getRollId());
+ mallRollPerk.setMemberId(memberId);
+ IPage<MallRollPerk> mallGoodsCommentVoIPage = this.baseMapper.findMallRollPerkInPage(page,mallRollPerk);
+ return new FebsResponse().success().data(mallGoodsCommentVoIPage);
+ }
+
+ @Override
+ public FebsResponse findMallMemberClassInPage(ApiMemberClassDto queryDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMemberClass mallMemberClass = new MallMemberClass();
+ Page<MallMemberClass> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ mallMemberClass.setMemberId(memberId);
+ IPage<MallMemberClass> mallMemberClassList = this.baseMapper.findMallMemberClassInPage(page,mallMemberClass);
+ return new FebsResponse().success().data(mallMemberClassList);
+ }
+
+ @Override
+ public FebsResponse findMallMemberHouseInPage(ApiMemberHouseDto queryDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMemberHouse mallMemberHouse = new MallMemberHouse();
+ Page<MallMemberHouse> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ mallMemberHouse.setMemberId(memberId);
+ mallMemberHouse.setState(queryDto.getState());
+ IPage<MallMemberHouse> mallMemberHouseList = this.baseMapper.findMallMemberHouseInPage(page,mallMemberHouse);
+ return new FebsResponse().success().data(mallMemberHouseList);
+ }
+
private String getXcxLoginUrl(String code) {
String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
--
Gitblit v1.9.1