autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +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);
}
/**