From 01ba834a6e2ce7325a8629737d7f8d03f91e7294 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 01 Mar 2024 16:29:23 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 0635ce0..e1ee656 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
@@ -83,7 +83,8 @@
if (mallMember != null) {
throw new FebsException("账号已使用，请重新注册。");
}
- String userKey = registerDto.getUserKey();
+ Integer selectCount = this.baseMapper.selectCount(null);
+ String userKey = ShareCodeUtil.toSerialNumberCode(selectCount);
MallMember mallMemberKey = this.baseMapper.selectByUserKey(userKey);
if (mallMemberKey != null) {
throw new FebsException("账号已使用，请重新注册。");
@@ -382,8 +383,10 @@
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
- myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
+ BigDecimal myAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieve(myAchieve);
+ BigDecimal myTeamAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieve(myTeamAchieve.add(myAchieve));
myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
}
@@ -404,10 +407,14 @@
myTeamVo.setAccountLogin(mallMember.getAccountLogin());
myTeamVo.setIsFrozen(mallMember.getIsFrozen());
myTeamVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMember.getLevel()));
- myTeamVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2));
- myTeamVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2));
+ BigDecimal myAchieveBuy = this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieveBuy(myAchieveBuy);
+ BigDecimal myAchieveSell = this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieveSell(myAchieveSell);
+ BigDecimal myTeamAchieveBuy = this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieveBuy(myTeamAchieveBuy.add(myAchieveBuy));
+ BigDecimal myTeamAchieveSell = this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieveSell(myTeamAchieveSell.add(myAchieveSell));
myTeamVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
Integer buyCnt = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMember.getInviteId());
Integer sellCnt = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMember.getInviteId());
@@ -422,10 +429,15 @@
myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin());
myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen());
myTeamDirectVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMembersDirect.getLevel()));
- myTeamDirectVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1));
- myTeamDirectVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1));
- myTeamDirectVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2));
- myTeamDirectVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2));
+
+ BigDecimal myAchieveBuyDirect = this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1);
+ myTeamDirectVo.setMyAchieveBuy(myAchieveBuyDirect);
+ BigDecimal myAchieveSellDirect = this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1);
+ myTeamDirectVo.setMyAchieveSell(myAchieveSellDirect);
+ BigDecimal myTeamAchieveBuyDirect = this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2);
+ myTeamDirectVo.setMyTeamAchieveBuy(myTeamAchieveBuyDirect.add(myAchieveBuyDirect));
+ BigDecimal myTeamAchieveSellDirect = this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2);
+ myTeamDirectVo.setMyTeamAchieveSell(myTeamAchieveSellDirect.add(myAchieveSellDirect));
myTeamDirectVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMembersDirect.getInviteId()).size());
Integer buyCntDirect = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMembersDirect.getInviteId());
Integer sellCntDirect = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMembersDirect.getInviteId());
@@ -851,10 +863,10 @@
MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectByMemberId(memberId);
mallMemberPayment.setWxQrcode(updatePaymentDto.getWxQrcode());
- mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
+// mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
mallMemberPayment.setBankName(updatePaymentDto.getBankName());
- mallMemberPayment.setBankNo(updatePaymentDto.getBankNo());
- mallMemberPayment.setBank(updatePaymentDto.getBank());
+// mallMemberPayment.setBankNo(updatePaymentDto.getBankNo());
+// mallMemberPayment.setBank(updatePaymentDto.getBank());
mallMemberPayment.setPhone(updatePaymentDto.getPhone());
mallMemberPayment.setUsdtTongdao(updatePaymentDto.getUsdtTongdao());
mallMemberPayment.setUsdtAddress(updatePaymentDto.getUsdtAddress());
--
Gitblit v1.9.1