From ea2938522357f193ee82938129a8094c594f1fb1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Jul 2023 17:33:21 +0800
Subject: [PATCH] 用户登录获取用户的微信昵称和头像
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 155 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 38 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 95f2dc5..37289ce 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
@@ -16,9 +16,11 @@
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -66,6 +68,9 @@
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final SpringContextHolder springContextHolder;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
+ private final AgentProducer agentProducer;
@Value("${spring.profiles.active}")
@@ -196,7 +201,9 @@
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
- return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
+// return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
+ //去掉时间戳
+ return rsa.encryptBase64(token, KeyType.PublicKey);
}
@Override
@@ -254,13 +261,32 @@
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);
+ //代理状态
+ MallAgentRecord mallAgentRecordIng = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_ING);
+ MallAgentRecord mallAgentRecordAgree = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_AGREE);
+ MallAgentRecord mallAgentRecordDisagree = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_DISAGREE);
+ if(ObjectUtil.isNotEmpty(mallAgentRecordIng)){
+ mallMemberVo.setIsAgent(1);
+ }else if(ObjectUtil.isNotEmpty(mallAgentRecordAgree)){
+ mallMemberVo.setIsAgent(2);
+ if(StrUtil.isNotEmpty(mallAgentRecordAgree.getAgentLevel())){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_APPLY", mallAgentRecordAgree.getAgentLevel());
+ mallMemberVo.setAgentLevelName(dataDictionaryCustom.getDescription());
+ }
+ if(AgentLevelEnum.LEVEL_ONE.name().equals(mallAgentRecordAgree.getAgentLevel())){
+ mallMemberVo.setAgentLevel(1);
+ }
+ if(AgentLevelEnum.LEVEL_TWO.name().equals(mallAgentRecordAgree.getAgentLevel())){
+ mallMemberVo.setAgentLevel(2);
+ }
+ if(AgentLevelEnum.LEVEL_THREE.name().equals(mallAgentRecordAgree.getAgentLevel())){
+ mallMemberVo.setAgentLevel(3);
+ }
+ }else if(ObjectUtil.isNotEmpty(mallAgentRecordDisagree)){
+ mallMemberVo.setIsAgent(3);
}
+// log.info(mallMemberVo.getName()+"---"+mallMemberVo.getAgentLevel());
+
return new FebsResponse().success().data(mallMemberVo);
}
@@ -428,7 +454,7 @@
Long id = LoginUserUtil.getLoginUser().getId();
MallMember member = this.baseMapper.selectById(id);
- member.setBindPhone(accountAndCodeDto.getAccount());
+ member.setPhone(accountAndCodeDto.getAccount());
this.baseMapper.updateById(member);
}
@@ -569,34 +595,12 @@
}
String openId = json.getString("openid");
- String sessionKey = json.getString("session_key");
- log.info("openId={},sessionKey={}", openId, sessionKey);
+ String accessToken = json.getString("access_token");
+ log.info("openId={}", openId);
// 查询用户是否存在
- 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);
- }
+ MallMember mallMember = this.baseMapper.selectMemberByOpenId(openId);
+ if (ObjectUtil.isEmpty(mallMember)) {
+ return febsResponse.fail().message("请先关注公众号");
}
// 存放redis
String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId();
@@ -608,13 +612,16 @@
}
}
String token = IdUtil.simpleUUID();
- redisUtils.set(token, JSONObject.toJSONString(mallMember), 360000);
- redisUtils.set(redisKey, token, 360000);
+ redisUtils.set(token, JSONObject.toJSONString(mallMember), -1);
+ redisUtils.set(redisKey, token, -1);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
authInfo.put("appid", xcxProperties.getXcxAppid());
authInfo.put("member", mallMember);
authInfo.put("rasToken", generateAsaToken(token));
+ authInfo.put("accessToken",accessToken);
+ authInfo.put("openId",openId);
+ agentProducer.sendMemberInfoMsg(accessToken+"|"+openId);
febsResponse.success().data(authInfo);
} else {
return febsResponse.fail().message("自动登录失败");
@@ -640,7 +647,7 @@
if(StrUtil.isNotEmpty(avatarUrl)){
mallMember.setAvatar(avatarUrl);
}
- mallMember.setSex(apiXcxSaveInfoDto.getGender() == 1 ? "女" : "男");
+// mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
this.baseMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -735,6 +742,21 @@
if(BigDecimal.ZERO.compareTo(amount)>0){
return new FebsResponse().fail().message("请输入正确的充值金额");
}
+ Integer type = apiRechargeWalletDto.getType();
+ if(2 == type){
+ //成为合伙人的充值金额
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(apiRechargeWalletDto.getAgentApplyId());
+ BigDecimal agentPrice = mallAgentRecord.getAmount();
+// DataDictionaryCustom agentPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PRICE_AMOUNT.getType(),
+// DataDictionaryEnum.PRICE_AMOUNT.getCode());
+// String agentPrice = agentPriceDic.getValue();
+// BigDecimal price = new BigDecimal(agentPrice);
+ if(agentPrice.compareTo(amount) != 0){
+ return new FebsResponse().fail().message("成为合伙人的金额为"+agentPrice);
+ }
+ }
+ String rechargeNo = "CZ_"+MallUtils.getOrderNum();
+ apiRechargeWalletDto.setRechargeNo(rechargeNo);
apiRechargeWalletDto.setMemberId(memberId);
BrandWCPayRequestData brandWCPayRequestData = null;
try {
@@ -742,6 +764,14 @@
} catch (Exception e) {
throw new FebsException("支付失败");
}
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ amount,
+ MoneyFlowTypeEnum.RECHARGE.getValue(),
+ rechargeNo,
+ FlowTypeEnum.BALANCE.getValue(),
+ "余额充值",1);
+
String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
String payResultStr = brandWCPayRequestData.getPrepay_id();
Map<String, Object> map = new HashMap<>();
@@ -750,6 +780,55 @@
return new FebsResponse().success().data(map).message("充值即将到账");
}
+ @Override
+ public void updateMemberAgent(Long memberId,String levelCode) {
+ mallAgentRecordMapper.updateStateByMemberId(memberId);
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(memberId);
+ //更新用户表中的LEVEL
+ MallMember mallMember = this.baseMapper.selectById(mallAgentRecord.getMemberId());
+ mallMember.setLevel(levelCode);
+ this.baseMapper.updateById(mallMember);
+ }
+
+ @Override
+ public FebsResponse agentDetail() {
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.AGENT_DETAILS.getType(), DataDictionaryEnum.AGENT_DETAILS.getCode());
+ Map<String, Object> map = new HashMap<>();
+ if(ObjectUtil.isNotEmpty(dataDictionaryCustom)){
+ map.put("agentDetail", dataDictionaryCustom.getValue());
+ }
+ return new FebsResponse().success().data(map);
+ }
+
+ @Override
+ public FebsResponse activityInfo() {
+ DataDictionaryCustom activityBulletinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ACTIVITY_BULLETIN.getType(), DataDictionaryEnum.ACTIVITY_BULLETIN.getCode());
+ DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.GIVE_AMOUNT.getType(), DataDictionaryEnum.GIVE_AMOUNT.getCode());
+ DataDictionaryCustom giveStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.GIVE_STATE.getType(), DataDictionaryEnum.GIVE_STATE.getCode());
+ Map<String, Object> map = new HashMap<>();
+ if(ObjectUtil.isNotEmpty(activityBulletinDic)){
+ map.put("activityBulletin",
+ ObjectUtil.isEmpty(activityBulletinDic.getValue()) ? "暂无活动" : activityBulletinDic.getValue());
+ }
+ if(ObjectUtil.isNotEmpty(giveAmountDic)){
+ map.put("giveAmount",
+ ObjectUtil.isEmpty(giveAmountDic.getValue()) ? 0 : giveAmountDic.getValue());
+ }
+ map.put("giveState",giveStateDic.getValue());
+ return new FebsResponse().success().data(map);
+ }
+
+ @Override
+ public FebsResponse agentApplyInfo() {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ ApiMallAgentRecordVo apiMallAgentRecordVo = mallAgentRecordMapper.selectApiMallAgentRecordVoByMemberIdAndState(memberId,MallAgentRecord.APPLY_ING);
+ return new FebsResponse().success().data(apiMallAgentRecordVo);
+ }
+
private String getXcxLoginUrl(String code) {
String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
--
Gitblit v1.9.1