autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修改字段名

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-08 09:59:09 +08:00
parent 153404729b
commit 25bce49bcc
8 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
View File

@@ -14,13 +14,11 @@ import com.jsowell.common.util.wxplatform.WXXmlToMapUtil;
import com.jsowell.pile.domain.agentDev.AuditItem;
import com.jsowell.pile.domain.agentDev.CategoryInfo;
import com.jsowell.pile.domain.agentDev.UserInfoSetting;
import com.jsowell.pile.dto.WechatLoginDTO;
import com.jsowell.pile.dto.agentDev.*;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.vo.agentDev.AuthInfoVO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.aspectj.weaver.ast.Var;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -633,10 +631,10 @@ public class AgentDevService {
// 获取openId
String openId = getOpenIdByCode(dto.getOpenIdCode(), appId);
// 通过 appid 查询 merchantId
String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId);
logger.info("微信一键登录 获取merchantId:{}", merchantId);
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId);
logger.info("微信一键登录 获取merchantId:{}", firstLevelMerchantId);
// 下面方法有判断 merchantId 是否为空，因此可直接传值
return memberService.memberRegisterAndLogin(phoneNumber, merchantId, openId);
return memberService.memberRegisterAndLogin(phoneNumber, firstLevelMerchantId, openId);
}
/**

16
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -134,21 +134,21 @@ public class MemberService {
/**
* 公共登陆注册方法
* @param phoneNumber 手机号
* @param merchantId 商户id
* @param firstLevelMerchantId 商户id
* @return token返给前端
*/
protected String memberRegisterAndLogin(String phoneNumber, String merchantId, String openId) {
protected String memberRegisterAndLogin(String phoneNumber, String firstLevelMerchantId, String openId) {
if (StringUtils.isBlank(phoneNumber)) {
throw new BusinessException(ReturnCodeEnum.CODE_GET_MOBILE_NUMBER_BY_CODE_ERROR);
}
if (StringUtils.isBlank(merchantId)) {
if (StringUtils.isBlank(firstLevelMerchantId)) {
throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR);
}
if (StringUtils.isBlank(openId)) {
throw new BusinessException(ReturnCodeEnum.CODE_OPEN_ID_IS_NULL_ERROR);
}
// 查询手机号码是否注册过
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, merchantId);
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, firstLevelMerchantId);
if (Objects.isNull(memberBasicInfo)) {
// 不存在则新增数据
String memberId = generateNewMemberId();
@@ -157,13 +157,13 @@ public class MemberService {
memberBasicInfo.setMemberId(memberId);
memberBasicInfo.setNickName("会员" + memberId);
memberBasicInfo.setMobileNumber(phoneNumber);
memberBasicInfo.setMerchantId(Long.valueOf(merchantId));
memberBasicInfo.setMerchantId(Long.valueOf(firstLevelMerchantId));
memberBasicInfo.setOpenId(openId);
MemberTransactionDTO memberTransactionDTO = new MemberTransactionDTO();
memberTransactionDTO.setMemberBasicInfo(memberBasicInfo);
// 首次新建会员，同时新建会员钱包
if (StringUtils.equals("35", merchantId)) {
if (StringUtils.equals("35", firstLevelMerchantId)) {
MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder()
.memberId(memberId)
.merchantId("35")
@@ -218,9 +218,9 @@ public class MemberService {
log.error("getOpenIdByCode发生异常", e);
}
// 根据appid查询merchantId
String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(APP_ID);
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(APP_ID);
// 查询手机号码是否注册过
return memberRegisterAndLogin(mobileNumber, merchantId, openId);
return memberRegisterAndLogin(mobileNumber, firstLevelMerchantId, openId);
}
/**