From 5a8bb0c1dde052c6c95d545f53ae27d42338529d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Sep 2022 17:57:35 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 341 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 296 insertions(+), 45 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 3792781..95f2dc5 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
@@ -2,11 +2,14 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
+import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -14,6 +17,8 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
+import cc.mrbird.febs.pay.service.IXcxPayService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -22,6 +27,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,14 +35,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
+import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -57,6 +63,9 @@
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
+ private final MallRegisterAppealMapper mallRegisterAppealMapper;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final SpringContextHolder springContextHolder;
@Value("${spring.profiles.active}")
@@ -70,11 +79,21 @@
throw new FebsException("该账号已被占用");
}
+ List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
+ if (CollUtil.isNotEmpty(mallMembers)) {
+ MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
+ if (registerAppeal == null || registerAppeal.getStatus() != 1) {
+ return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+ }
+ }
+
String account = registerDto.getAccount();
- String code = registerDto.getCode();
- boolean flags = commonService.verifyCode(account, code);
- if(!flags) {
- throw new FebsException("验证码错误");
+ if (!"admin".equals(registerDto.getRegistType())) {
+ String code = registerDto.getCode();
+ boolean flags = commonService.verifyCode(account, code);
+ if (!flags) {
+ throw new FebsException("验证码错误");
+ }
}
mallMember = new MallMember();
@@ -97,11 +116,12 @@
mallMember.setReferrerId(registerDto.getInviteId());
}
- mallMember.setName(registerDto.getAccount());
+ mallMember.setName(registerDto.getName());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
mallMember.setSex("男");
+ mallMember.setBindPhone(registerDto.getAccount());
this.baseMapper.insert(mallMember);
@@ -201,7 +221,8 @@
@Override
public FebsResponse logout() {
Long id = LoginUserUtil.getLoginUser().getId();
- redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
+ redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id);
+ redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id);
return new FebsResponse().success().message("退出登录");
}
@@ -211,10 +232,11 @@
MallMember mallMember = this.baseMapper.selectById(id);
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
-
- MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
- if (referMember != null) {
- mallMemberVo.setReferrerName(referMember.getName());
+ if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
}
if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -226,15 +248,19 @@
mallMemberVo.setHasPayment(1);
}
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
- if (dic != null) {
- mallMemberVo.setLevelName(dic.getDescription());
- }
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
+
+ //用户是否是团长
+ List<MallTeamLeader> mallTeamLeaders = mallTeamLeaderMapper.selectListByMemberIdAndState(mallMember.getId(), MallTeamLeader.STATE_YES);
+ if(CollUtil.isNotEmpty(mallTeamLeaders)){
+ mallMemberVo.setIsTeamLeader(1);
+ }else{
+ mallMemberVo.setIsTeamLeader(2);
+ }
return new FebsResponse().success().data(mallMemberVo);
}
@@ -303,25 +329,12 @@
MallMember mallMember = this.baseMapper.selectById(memberId);
List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
- BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());
-
- TeamListVo own = new TeamListVo();
- own.setCreatedTime(mallMember.getCreatedTime());
- own.setAmount(ownAmount);
- own.setName(mallMember.getName());
- own.setPhone(mallMember.getPhone());
- own.setInviteId(mallMember.getInviteId());
- own.setIsCurrent(1);
- own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
- own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
- own.setId(mallMember.getId());
-// list.add(0, own);
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
- myTeamVo.setMyAchieve(BigDecimal.valueOf(100));
- myTeamVo.setMyTeamAchieve(BigDecimal.valueOf(100));
- myTeamVo.setMyTeamCnt(100);
+ myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
+ myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
+ myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
}
@@ -423,15 +436,7 @@
public BigDecimal canMoney() {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
-
- BigDecimal canMoney = wallet.getBalance();
- if (profit != null) {
- if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
- }
- return canMoney;
+ return wallet.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
}
@Override
@@ -485,7 +490,7 @@
MallShopApply hasApply = mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
if (hasApply != null) {
if (!hasApply.getStatus().equals(MallShopApply.APPLY_DISAGREE)) {
- throw new FebsException("审核中或审核已通过");
+ throw new FebsException("请勿重复提交申请");
}
}
@@ -503,4 +508,250 @@
return mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
}
+
+ @Override
+ public void addRegisterAppeal(RegisterAppealDto registerAppeal) {
+ MallRegisterAppeal isExist = mallRegisterAppealMapper.selectByPhoneAndName(registerAppeal.getName(), registerAppeal.getPhone());
+ if (isExist != null) {
+ throw new FebsException("申诉已存在");
+ }
+
+ isExist = new MallRegisterAppeal();
+ isExist.setName(registerAppeal.getName());
+ isExist.setPhone(registerAppeal.getPhone());
+ isExist.setStatus(2);
+
+ mallRegisterAppealMapper.insert(isExist);
+ }
+
+ @Override
+ public CashOutSettingVo cashOutSetting() {
+ CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode());
+ if (dic != null) {
+ cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
+ }
+ return cashOutSettingVo;
+ }
+
+ @Override
+ public List<ShopListVo> findShopListVo(ShopListDto shopListDto) {
+ Page<MallShopApply> page = new Page<>(shopListDto.getPageNow(), shopListDto.getPageSize());
+
+ MallShopApply shopApply = new MallShopApply();
+ shopApply.setStatus(MallShopApply.APPLY_AGREE);
+ IPage<MallShopApply> pageResult = mallShopApplyMapper.selectShopApplyInPage(shopApply, page);
+
+ List<MallShopApply> list = pageResult.getRecords();
+ if (CollUtil.isEmpty(list)) {
+ list = new ArrayList<>();
+ }
+ return MallShopApplyConversion.INSTANCE.entitiesToVOs(list);
+ }
+
+
+ private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+
+ @Override
+ public FebsResponse xcxLogin(ApiXcxLoginDto apiXcxLoginDto) throws IOException {
+ FebsResponse febsResponse = new FebsResponse();
+ String code = apiXcxLoginDto.getCode();
+ log.info("code:" + code);
+ if (StrUtil.isNotBlank(code)) {
+ String requrl = getXcxLoginUrl(code);
+ String reslutData = HttpCurlUtil.sendGetHttp(requrl, null);
+ net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(reslutData);
+ log.info("微信登录获取到登录信息={}", json);
+
+ if (json.containsKey("errcode")) {
+ log.info("微信登录获取到异常信息errcode");
+ return febsResponse.fail().message("自动登录失败");
+ }
+
+ String openId = json.getString("openid");
+ String sessionKey = json.getString("session_key");
+ log.info("openId={},sessionKey={}", openId, sessionKey);
+ // 查询用户是否存在
+ MallMember mallMember = null;
+ synchronized (this) {
+ mallMember = this.baseMapper.selectMemberByOpenId(openId);
+ if (ObjectUtil.isEmpty(mallMember)) {
+ // 新增用户
+ mallMember = new MallMember();
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+ mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
+ mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
+ mallMember.setOpenId(openId);
+ mallMember.setSessionKey(sessionKey);
+ this.baseMapper.insert(mallMember);
+
+ mallMember = this.baseMapper.selectMemberByOpenId(openId);
+ String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
+ mallMember.setInviteId(inviteId);
+ this.baseMapper.updateById(mallMember);
+ MallMemberWallet wallet = new MallMemberWallet();
+ wallet.setBalance(BigDecimal.ZERO);
+ wallet.setMemberId(mallMember.getId());
+ mallMemberWalletMapper.insert(wallet);
+ } else {
+ mallMember.setSessionKey(sessionKey);
+ this.baseMapper.updateById(mallMember);
+ }
+ }
+ // 存放redis
+ String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
+ String token = IdUtil.simpleUUID();
+ redisUtils.set(token, JSONObject.toJSONString(mallMember), 360000);
+ redisUtils.set(redisKey, token, 360000);
+ Map<String, Object> authInfo = new HashMap<>();
+ authInfo.put("token", token);
+ authInfo.put("appid", xcxProperties.getXcxAppid());
+ authInfo.put("member", mallMember);
+ authInfo.put("rasToken", generateAsaToken(token));
+ febsResponse.success().data(authInfo);
+ } else {
+ return febsResponse.fail().message("自动登录失败");
+ }
+ return febsResponse;
+ }
+
+ @Override
+ public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
+ log.info("name={},phone={},avatar={},sex={}",
+ apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+ String nickName = apiXcxSaveInfoDto.getNickName();
+ if(StrUtil.isNotEmpty(nickName)){
+ mallMember.setName(nickName);
+ }
+ String phone = apiXcxSaveInfoDto.getPhone();
+ if(StrUtil.isNotEmpty(phone)){
+ mallMember.setPhone(phone);
+ }
+ String avatarUrl = apiXcxSaveInfoDto.getAvatarUrl();
+ if(StrUtil.isNotEmpty(avatarUrl)){
+ mallMember.setAvatar(avatarUrl);
+ }
+ mallMember.setSex(apiXcxSaveInfoDto.getGender() == 1 ? "女" : "男");
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse xcxPhoneLogin(ApiXcxPhoneLoginDto apiXcxPhoneLoginDto) {
+ String phone = apiXcxPhoneLoginDto.getPhone();
+ boolean flag = commonService.verifyCode(phone, apiXcxPhoneLoginDto.getCode());
+ if (flag) {
+ // 查询用户是否存在
+ MallMember mallMember = null;
+ synchronized (this) {
+ mallMember = this.baseMapper.selectInfoByAccount(apiXcxPhoneLoginDto.getPhone());
+ if (ObjectUtil.isEmpty(mallMember)) {
+ // 新增用户
+ mallMember = new MallMember();
+ mallMember.setPhone(phone);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+ mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
+ mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
+ this.baseMapper.insert(mallMember);
+
+ String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
+ mallMember.setInviteId(inviteId);
+ this.baseMapper.updateById(mallMember);
+ MallMemberWallet wallet = new MallMemberWallet();
+ wallet.setBalance(BigDecimal.ZERO);
+ wallet.setMemberId(mallMember.getId());
+ mallMemberWalletMapper.insert(wallet);
+ }
+ }
+ // 存放redis
+ String redisKey = AppContants.XCX_LOGIN_PHONE_PREFIX + mallMember.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
+ String token = IdUtil.simpleUUID();
+ redisUtils.set(token, JSONObject.toJSONString(mallMember), 360000);
+ redisUtils.set(redisKey, token, 360000);
+ Map<String, Object> authInfo = new HashMap<>();
+ authInfo.put("token", token);
+ authInfo.put("member", mallMember);
+ authInfo.put("rasToken", generateAsaToken(token));
+ return new FebsResponse().success().data(authInfo);
+ }
+ return new FebsResponse().fail().message("验证码错误");
+ }
+
+ @Override
+ public FebsResponse xcxOpen(ApiXcxOpenDto apiXcxOpenDto) {
+ DataDictionaryCustom rangeSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SWITCH.getType(), DataDictionaryEnum.RANGE_SWITCH.getCode());
+ if(StrUtil.isNotBlank(rangeSwitch.getValue()) && "1".equals(rangeSwitch.getValue())){
+ if(ObjectUtil.isNull(apiXcxOpenDto.getLongitude()) || ObjectUtil.isNull(apiXcxOpenDto.getLatitude())){
+ return new FebsResponse().fail().message("请授权位置信息");
+ }
+ Double longitude = apiXcxOpenDto.getLongitude();
+ Double latitude = apiXcxOpenDto.getLatitude();
+
+ DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
+ if(ObjectUtil.isEmpty(rangeSize)){
+ return new FebsResponse().success().data(2);
+ }
+ if(StrUtil.isBlank(rangeSize.getValue())){
+ return new FebsResponse().success().data(2);
+ }
+ //方位大小，换成单位：米
+ Integer value = Integer.parseInt(rangeSize.getValue()) * 1000;
+ //根据经纬度获取周围团长的距离
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByLonAndLat(longitude, latitude);
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ return new FebsResponse().success().data(2);
+ }
+ Double distance = mallTeamLeader.getDistance();
+ if(value <= distance){
+ return new FebsResponse().success().data(2);
+ }
+ }
+ return new FebsResponse().success().data(1);
+ }
+
+ private final IXcxPayService iXcxPayService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse rechargeWallet(ApiRechargeWalletDto apiRechargeWalletDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ BigDecimal amount = apiRechargeWalletDto.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount)>0){
+ return new FebsResponse().fail().message("请输入正确的充值金额");
+ }
+ apiRechargeWalletDto.setMemberId(memberId);
+ BrandWCPayRequestData brandWCPayRequestData = null;
+ try {
+ brandWCPayRequestData = iXcxPayService.startRechargeWallet(apiRechargeWalletDto);
+ } catch (Exception e) {
+ throw new FebsException("支付失败");
+ }
+ String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
+ String payResultStr = brandWCPayRequestData.getPrepay_id();
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderInfo", payResultStr);
+ map.put("wxResultStr", wxResultStr);
+ return new FebsResponse().success().data(map).message("充值即将到账");
+ }
+
+ private String getXcxLoginUrl(String code) {
+ String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
+ return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
+ }
}
--
Gitblit v1.9.1