一键登录接口兼容支付宝

jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java

@@ -16,6 +16,7 @@ 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.MemberRegisterAndLoginDTO;
 import com.jsowell.pile.dto.agentDev.*;
 import com.jsowell.pile.service.PileMerchantInfoService;
 import com.jsowell.pile.vo.agentDev.AuthInfoVO;
@@ -639,7 +640,13 @@ public class AgentDevService {
         String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
         logger.info("微信一键登录 获取merchantId:{}", firstLevelMerchantId);
         // 下面方法有判断 merchantId 是否为空，因此可直接传值
-        return memberService.memberRegisterAndLogin(phoneNumber, firstLevelMerchantId, openId);
+        MemberRegisterAndLoginDTO loginDTO = MemberRegisterAndLoginDTO.builder()
+                .openId(openId)
+                .firstLevelMerchantId(firstLevelMerchantId)
+                .mobileNumber(phoneNumber)
+                .requestSource(dto.getRequestSource())
+                .build();
+        return memberService.memberRegisterAndLogin(loginDTO); // 其他一级运营商，微信一键登录
     }
 
     /**