From e8dd7cfa6bbfd8be4a52f24e03c74f853cc6ac4f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 51363f3..9e01ef6 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -310,15 +310,14 @@
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, openId)
.eq(Member::getIsdeleted,Constants.ZERO)
.last(" limit 1"));
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
- String token = JwtTokenUtil.generateToken(payLoad);
AccountResponse accountResponse = new AccountResponse();
- accountResponse.setSessionKey(session.getSessionKey());
if(Objects.nonNull(member)){
memberMapper.updateById(member);
member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
+ String token = JwtTokenUtil.generateToken(payLoad);
accountResponse.setToken(token);
accountResponse.setMember(member);
}else{
@@ -345,10 +344,8 @@
@Override
public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest){
try {
- WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNoInfo(
- wxPhoneRequest.getSessionKey(), wxPhoneRequest.getEncryptedData(), wxPhoneRequest.getIv());
- //鑾峰彇鎵嬫満鍙�
- String phone= userPhoneInfo.getPurePhoneNumber();
+ WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
+ String phone = userPhoneInfo.getPhoneNumber();
if(Objects.isNull(phone)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
}
@@ -367,6 +364,7 @@
member.setRecId(Constants.getInviteCode(wxPhoneRequest.getRecId()));
}
member.setOpenId(wxPhoneRequest.getOpenid());
+ member.setIntegral(BigDecimal.ZERO);
}
member.setPhone(phone);
member.setEditDate(new Date());
@@ -466,6 +464,17 @@
platformConfigDTO.getShareIntegralReward():BigDecimal.ZERO);
inviteRecord.setFirstOrderStatus(Constants.ZERO);
inviteRecordMapper.insert(inviteRecord);
+ //璧犻�侀個璇风Н鍒�
+ //寮�鍚個璇锋敞鍐岄�佺Н鍒�
+ if(Constants.equalsInteger(platformConfigDTO.getShareIntegralRewardStatus(),Constants.ZERO)){
+ DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
+ dealIntegralRequest.setIntegralNum(platformConfigDTO.getShareIntegralReward());
+ dealIntegralRequest.setDealType(Constants.ZERO);
+ dealIntegralRequest.setMemberId(member.getRecId());
+ dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
+ dealIntegralRequest.setParam1(member.getNickname());
+ integralService.dealIntegral(dealIntegralRequest);
+ }
}
--
Gitblit v1.9.3