From 1a66508ad3d73dcc456162c553b03f2208570b51 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 31 Aug 2022 16:15:54 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 242 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 224 insertions(+), 18 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 2125d43..fb65cc4 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
@@ -6,6 +6,7 @@
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;
@@ -16,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;
@@ -24,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;
@@ -31,10 +35,12 @@
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.*;
@@ -58,6 +64,8 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
private final MallRegisterAppealMapper mallRegisterAppealMapper;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final SpringContextHolder springContextHolder;
@Value("${spring.profiles.active}")
@@ -213,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("退出登录");
}
@@ -238,15 +247,23 @@
mallMemberVo.setHasPayment(1);
}
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
- if (dic != null) {
- mallMemberVo.setLevelName(dic.getDescription());
- }
+// 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);
}
@@ -315,23 +332,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());
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
- myTeamVo.setMyTeamCnt(list.size());
+ myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
}
@@ -435,7 +441,7 @@
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
- BigDecimal canMoney = wallet.getBalance();
+ BigDecimal canMoney = wallet.getCommission();
if (profit != null) {
if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
canMoney = canMoney.subtract(profit);
@@ -553,4 +559,204 @@
}
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);
+ 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();
+ return new FebsResponse().success().message("充值即将到账");
+ }
+
+ private String getXcxLoginUrl(String code) {
+ String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
+ return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
+ }
}
--
Gitblit v1.9.1