From d4c0bf0a7cf69d58f87b07031aa6ba1ecfaa012b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 May 2024 10:41:34 +0800
Subject: [PATCH] 增加支付宝收款码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 312 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 283 insertions(+), 29 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 3970c58..309c971 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
@@ -24,6 +24,7 @@
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,6 +37,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -61,11 +63,28 @@
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallMemberBankMapper mallMemberBankMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
+ private final MallProductBuyMapper mallProductBuyMapper;
+ private final MallMemberSpeakMapper mallMemberSpeakMapper;
+ private final MallMemberChargeMapper mallMemberChargeMapper;
@Value("${spring.profiles.active}")
private String active;
+ private static final String ACCOUNT_PATTERN = "^[a-zA-Z0-9]{8,16}$";
+ private static final Pattern pattern = Pattern.compile(ACCOUNT_PATTERN);
+
+
+ public static boolean validateAccount(String account) {
+ return pattern.matcher(account).matches();
+ }
+
+ public static void main(String[] args) {
+ String account = "example"; // 示例账号，可以根据需要替换
+ boolean isValid = validateAccount(account);
+ System.out.println("账号是否有效: " + isValid);
+ }
@Transactional(rollbackFor = Exception.class)
@Override
public FebsResponse register(RegisterDto registerDto) {
@@ -76,11 +95,16 @@
* 返回账号和密钥给前端
*/
String accountLogin = registerDto.getAccountLogin();
+ boolean isValid = validateAccount(accountLogin);
+ if(!isValid){
+ throw new FebsException("账号不规范。");
+ }
MallMember mallMember = this.baseMapper.selectByAccountLogin(accountLogin);
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("账号已使用，请重新注册。");
@@ -102,9 +126,11 @@
}
// mallMember.setName(registerDto.getName());
// mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
+ mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
+ mallMember.setPartner(2);
// mallMember.setSex("男");
// mallMember.setBindPhone(registerDto.getAccount());
@@ -147,7 +173,15 @@
MallMemberAmount mallMemberAmount = new MallMemberAmount();
mallMemberAmount.setMemberId(mallMember.getId());
mallMemberAmountMapper.insert(mallMemberAmount);
- return new FebsResponse().success().message("注册成功");
+
+ MallMemberPayment mallMemberPayment = new MallMemberPayment();
+ mallMemberPayment.setMemberId(mallMember.getId());
+ mallMemberPaymentMapper.insert(mallMemberPayment);
+
+ ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
+ apiRegisterVo.setAccount(mallMember.getAccountLogin());
+ apiRegisterVo.setUserKey(mallMember.getUserKey());
+ return new FebsResponse().success().data(apiRegisterVo);
}
@Override
@@ -230,10 +264,20 @@
mallMemberVo.setHasPayment(1);
}
+ DataDictionaryCustom nftMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.NFT_MIN.getType(),
+ DataDictionaryEnum.NFT_MIN.getCode());
+ mallMemberVo.setNftMin(ObjectUtil.isEmpty(nftMinDic) ? new BigDecimal(100) : new BigDecimal(nftMinDic.getValue()));
+
+ DataDictionaryCustom outFcmMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.OUT_FCM_MIN.getType(),
+ DataDictionaryEnum.OUT_FCM_MIN.getCode());
+ mallMemberVo.setOutFcmMin(ObjectUtil.isEmpty(outFcmMinDic) ? new BigDecimal(100) : new BigDecimal(outFcmMinDic.getValue()));
+
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
- mallMemberVo.setFcmPrice(ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(2) : new BigDecimal(fcmPriceDic.getValue()));
+ mallMemberVo.setFcmPrice(ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(8) : new BigDecimal(fcmPriceDic.getValue()));
DataDictionaryCustom outFcmFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.OUT_FCM_FEE.getType(),
@@ -246,11 +290,28 @@
BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
mallMemberVo.setNftFee(nftFeePercent);
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
+ DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getType(),
+ DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
+ );
+ BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
+ mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
+
+ DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()
+ );
+ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
+ mallMemberVo.setMinuteCnt(insureMinute);
+
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMember.getLevel(), mallMember.getLevel());
if (dic != null) {
mallMemberVo.setLevelName(dic.getDescription());
+ }else{
+ mallMemberVo.setLevelName("非会员");
}
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberVo.setGsd(mallMemberAmount.getGsd());
mallMemberVo.setStaticNft(mallMemberAmount.getStaticNft());
mallMemberVo.setTrendsNft(mallMemberAmount.getTrendsNft());
mallMemberVo.setFrozenNft(mallMemberAmount.getFrozenNft());
@@ -258,6 +319,7 @@
mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
+ mallMemberVo.setTotalPerk(mallMemberAmount.getTotalPerk());
DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.YU_YUE_START_TIME.getType(),
DataDictionaryEnum.YU_YUE_START_TIME.getCode()
@@ -268,6 +330,31 @@
DataDictionaryEnum.YU_YUE_END_TIME.getCode()
);
mallMemberVo.setEndTime(endTimeDic.getValue());
+
+ Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
+ mallMemberVo.setPickCount(pickCount);
+
+// BigDecimal totalPerk = mallProductBuyMapper.selectTotalPerkByMemberId(mallMember.getId());
+// mallMemberVo.setTotalPerk(totalPerk);
+
+ DataDictionaryCustom insideNFTPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getType(),
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getCode()
+ );
+ mallMemberVo.setInsideNFTPercent(insideNFTPercentDic.getValue());
+
+ DataDictionaryCustom chargeAddressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.CHARGE_ADDRESS.getType(),
+ DataDictionaryEnum.CHARGE_ADDRESS.getCode()
+ );
+ mallMemberVo.setChargeAddress(chargeAddressDic.getValue());
+
+ DataDictionaryCustom withdrawAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.WITHDRAW_AMOUNT.getType(),
+ DataDictionaryEnum.WITHDRAW_AMOUNT.getCode()
+ );
+ BigDecimal withdrawAmount = new BigDecimal(withdrawAmountDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
+ mallMemberVo.setWithdrawAmount(withdrawAmount);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -336,9 +423,75 @@
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);
+ }
+
+ @Override
+ public FebsResponse teamFcmList(TeamListDto teamListDto) {
+ Long memberId = null;
+ if (ObjectUtil.isEmpty(teamListDto.getId())) {
+ memberId = LoginUserUtil.getLoginUser().getId();
+ } else {
+ memberId = teamListDto.getId();
+ }
+
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+
+ MyFcmTeamVo myTeamVo = new MyFcmTeamVo();
+ myTeamVo.setMemberId(mallMember.getId());
+ myTeamVo.setAccountLogin(mallMember.getAccountLogin());
+ myTeamVo.setIsFrozen(mallMember.getIsFrozen());
+ myTeamVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMember.getLevel()));
+ 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());
+ myTeamVo.setMyTeamOrderCnt(buyCnt+sellCnt);
+
+ List<MallMember> mallMembersDirects = this.baseMapper.selectChildAgentListByInviteId(mallMember.getInviteId());
+ List<MyFcmTeamVo> list = new ArrayList<>();
+ if(CollUtil.isNotEmpty(mallMembersDirects)){
+ for(MallMember mallMembersDirect : mallMembersDirects){
+ MyFcmTeamVo myTeamDirectVo = new MyFcmTeamVo();
+ myTeamDirectVo.setMemberId(mallMembersDirect.getId());
+ myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin());
+ myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen());
+ myTeamDirectVo.setLevelName(
+ dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMembersDirect.getLevel(),mallMembersDirect.getLevel()).getDescription()
+ );
+
+ 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());
+ myTeamDirectVo.setMyTeamOrderCnt(buyCntDirect+sellCntDirect);
+ list.add(myTeamDirectVo);
+ }
+ }
+
+ myTeamVo.setTeam(list);
+
+
+
return new FebsResponse().success().data(myTeamVo);
}
@@ -352,7 +505,8 @@
IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
Long id = LoginUserUtil.getLoginUser().getId();
moneyFlowDto.setMemberId(id);
- IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+// IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
return new FebsResponse().success().data(pages);
}
@@ -379,7 +533,7 @@
BigDecimal amount = transferDto.getAmount();
int type = transferDto.getType();
- if(1 != type || 2 != type){
+ if(1 != type && 2 != type && 3 != type){
throw new FebsException("请选择互转类型");
}
Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
@@ -404,7 +558,6 @@
throw new FebsException("交易密码错误");
}
- BigDecimal avaAmount = transferDto.getAmount().setScale(2, BigDecimal.ROUND_DOWN);
MallMemberAmount mallMemberAmountLogin = mallMemberAmountMapper.selectByMemberId(loginMember.getId());
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
if(1 == type){
@@ -435,7 +588,7 @@
}
if(2 == type){
if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
- throw new FebsException("令牌不足");
+ throw new FebsException("宝石不足");
}
mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
@@ -458,6 +611,47 @@
loginMember.getId(),
FlowTypeNewEnum.TOKEN.getValue(),
MoneyFlowTypeNewEnum.TOKEN_INSIDE_IN.getDescrition());
+ }
+ if(3 == type){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getType(),
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getCode()
+ );
+ BigDecimal feePercent = new BigDecimal("0.01").multiply(new BigDecimal(dataDictionaryCustom.getValue()));
+ if (amount.compareTo(mallMemberAmountLogin.getTrendsNft()) > 0) {
+ throw new FebsException("卡牌不足");
+ }
+ BigDecimal fee = amount.multiply(feePercent).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal amountReal = amount.subtract(fee);
+ mallMemberAmountLogin.setTrendsNft(mallMemberAmountLogin.getTrendsNft().subtract(amount));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountLogin);
+ String orderNo = MallUtils.getOrderNum("NFT");
+ mallMoneyFlowService.addMoneyFlow(
+ loginMember.getId(),
+ amountReal.negate(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT.getDescrition());
+ mallMoneyFlowService.addMoneyFlow(
+ loginMember.getId(),
+ fee.negate(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT_FEE.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT_FEE.getDescrition());
+ mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(amountReal));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmount);
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ amountReal,
+ MoneyFlowTypeNewEnum.NFT_TRANS_IN.getValue(),
+ orderNo,
+ loginMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_IN.getDescrition());
}
}
@@ -748,13 +942,19 @@
@Override
public FebsResponse updatePayment(UpdatePaymentDto updatePaymentDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+ QueryWrapper<MallProductBuy> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id",memberId);
+ List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectList(objectQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallProductBuys)){
+ throw new FebsException("信息无法修改");
+ }
MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectByMemberId(memberId);
mallMemberPayment.setWxQrcode(updatePaymentDto.getWxQrcode());
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());
@@ -766,6 +966,7 @@
@Override
public FebsResponse unfreeze(UnfreezeDto unfreezeDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember loginMember = this.baseMapper.selectById(memberId);
/**
* 判断账号是否冻结
* 判断账号FCM代币是否足够
@@ -785,46 +986,99 @@
DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
);
BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
- MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId);
- BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
+ MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
+ BigDecimal fcmCntAva = mallMemberAmount.getTokenAva();
if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
- throw new FebsException("解除冻结需要FCM的数量为：" + fcmCntAva);
+ throw new FebsException("激活需要宝石的数量为：" + fcmCntAva);
}
if(2 == unfreezeDto.getType()){
- List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
+ List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
List<Long> collectMemberIds = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
if(!collectMemberIds.contains(unfreezeMemberId)){
throw new FebsException("直接推荐人才能解除账户的冻结状态");
}
}
BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
- mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
+ mallMemberAmount.setTokenAva(fcmCntAvaSub);
mallMemberAmountMapper.updateById(mallMemberAmount);
mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
this.baseMapper.updateById(mallMember);
mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
+ memberId,
memberFrozenFcmCnt.negate(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
MallUtils.getOrderNum(),
memberId,
- FlowTypeNewEnum.FCM_COIN.getValue(),
+ FlowTypeNewEnum.TOKEN.getValue(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getDescrition());
return new FebsResponse().success().message("操作成功");
}
- public static void main(String[] args) {
- Set<String> objectsAccount = new HashSet<>();
- Set<String> objects = new HashSet<>();
- int j = 100;
- for(int i =0;i < 100 ; i++){
- String s = ShareCodeUtil.toSerialNumberCodeTwo(j);
- objects.add(s);
+ @Override
+ public FebsResponse memberSpeak(ApiMemberSpeakDto memberSpeakDto) {
+ MallMemberSpeak mallMemberSpeak = new MallMemberSpeak();
+ if(ObjectUtil.isNotEmpty(memberSpeakDto.getMemberId())){
+ mallMemberSpeak.setMemberId(memberSpeakDto.getMemberId());
+ }
+ mallMemberSpeak.setState(ProductEnum.SPEAK_NO_DEAL.getValue());
+ mallMemberSpeak.setDescription(memberSpeakDto.getDescription());
+ mallMemberSpeakMapper.insert(mallMemberSpeak);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInsideInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public FebsResponse chargeBalance(ApiChargeBalanceDto apiChargeBalanceDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+ BigDecimal amount = apiChargeBalanceDto.getAmount();
+ DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.CHARGE_AMOUNT.getType(),
+ DataDictionaryEnum.CHARGE_AMOUNT.getCode()
+ );
+ BigDecimal chargeAmount = new BigDecimal(chargeAmountDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
+ if(chargeAmount.compareTo(amount) > 0){
+ throw new FebsException("充值金额需要大于"+chargeAmount);
}
- System.out.println(objects);
- System.out.println(objects.size());
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("请设置交易密码");
+ }
+
+ if (!mallMember.getTradePassword().equals(SecureUtil.md5(apiChargeBalanceDto.getTradePassword()))) {
+ throw new FebsException("交易密码错误");
+ }
+ MallMemberCharge mallMemberCharge = new MallMemberCharge();
+ mallMemberCharge.setMemberId(memberId);
+ mallMemberCharge.setAmount(amount);
+ mallMemberCharge.setAddress(apiChargeBalanceDto.getAddress());
+ mallMemberCharge.setState(1);
+ mallMemberChargeMapper.insert(mallMemberCharge);
+
+
+ return new FebsResponse().success().message("操作成功");
}
+
+// public static void main(String[] args) {
+// Set<String> objectsAccount = new HashSet<>();
+// Set<String> objects = new HashSet<>();
+// int j = 100;
+// for(int i =0;i < 100 ; i++){
+// String s = ShareCodeUtil.toSerialNumberCodeTwo(j);
+// objects.add(s);
+// }
+//
+// System.out.println(objects);
+// System.out.println(objects.size());
+// }
}
--
Gitblit v1.9.1