diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index 5a793ec06..7abb9187d 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -137,7 +137,7 @@ public class MemberService {
 		// 	throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR);
 		// }
 		// 查询手机号码是否注册过
-		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber);
+		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, merchantId);
 		if (Objects.isNull(memberBasicInfo)) {
 			// 不存在则新增数据
 			String memberId = generateNewMemberId();
diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index 94e8f2056..214b84151 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -354,7 +354,7 @@ public class PileService {
 
 
 		// 通过前端传的手机号查询是否有此用户
-		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
+		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
 		if (memberBasicInfo == null) {
 			// 为空说明此用户未注册平台账号
 			throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java
index 04c298d36..79c1fffff 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationWhitelist.java
@@ -2,6 +2,8 @@ package com.jsowell.pile.domain;
 
 import com.jsowell.common.annotation.Excel;
 import com.jsowell.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author jsowell
  * @date 2023-04-19
  */
+@Getter
+@Setter
 public class PileStationWhitelist extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
@@ -19,6 +23,12 @@ public class PileStationWhitelist extends BaseEntity {
 	 */
 	private Long id;
 
+	/**
+	 * 运营商id
+	 */
+	@Excel(name = "运营商id")
+	private String merchantId;
+
 	/**
 	 * 站点id
 	 */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java
index 7895c040b..e43098473 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java
@@ -25,4 +25,6 @@ public class PileAuthCardDTO {
     private String phoneNumber;
 
     private String verificationCode;
+
+    private String merchantId;
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
index 8187a46bd..918a9a6ae 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
@@ -34,4 +34,6 @@ public class PileMemberBindingDTO {
      * 用户memberId
      */
     private String memberId;
+
+    private String merchantId;
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java
index efdb63519..a6de2151b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java
@@ -80,7 +80,7 @@ public interface IMemberBasicInfoService {
 	 * @param mobileNumber 手机号
 	 * @return
 	 */
-	MemberBasicInfo selectInfoByMobileNumber(String mobileNumber);
+	// MemberBasicInfo selectInfoByMobileNumber(String mobileNumber);
 
 	/**
 	 * 根据会员id查询会员信息
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
index 63bed2157..0a7a1ccb0 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
@@ -142,10 +142,10 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		return memberBasicInfoMapper.selectInfoByMobileNumberAndMerchantId(mobileNumber, merchantId);
 	}
 
-	@Override
-	public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber) {
-		return selectInfoByMobileNumber(mobileNumber, null);
-	}
+	// @Override
+	// public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber) {
+	// 	return selectInfoByMobileNumber(mobileNumber, null);
+	// }
 
 	@Override
 	public MemberBasicInfo selectInfoByMemberId(String memberId) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
index d730f3b43..c43698e70 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
@@ -1,25 +1,23 @@
 package com.jsowell.pile.service.impl;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Locale;
-
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.MemberBasicInfo;
-import com.jsowell.pile.dto.MemberRegisterAndLoginDTO;
+import com.jsowell.pile.domain.PileAuthCard;
 import com.jsowell.pile.dto.PileAuthCardDTO;
+import com.jsowell.pile.mapper.PileAuthCardMapper;
 import com.jsowell.pile.service.IMemberBasicInfoService;
+import com.jsowell.pile.service.IPileAuthCardService;
 import com.jsowell.pile.vo.uniapp.AuthCardVO;
 import com.jsowell.pile.vo.web.PileAuthCardVO;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.jsowell.pile.mapper.PileAuthCardMapper;
-import com.jsowell.pile.domain.PileAuthCard;
-import com.jsowell.pile.service.IPileAuthCardService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * 充电站鉴权卡Service业务层处理
@@ -108,7 +106,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
             memberBasicInfo.setStatus("0"); // 0-待激活
         }else {
             // 通过手机号查询memberId
-            memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
+            memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
             if (memberBasicInfo == null) {
                 // 为空则说明未查到该用户的注册信息
                 throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
@@ -139,7 +137,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
     @Override
     public int updateCardInfo(PileAuthCardDTO dto) {
         // 通过手机号查询memberId
-        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
+        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
         if (memberBasicInfo == null) {
             // 为空则说明未查到该用户的注册信息
             throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
@@ -228,7 +226,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
     public int bindAuthCard(PileAuthCardDTO dto) {
         String phoneNumber = dto.getPhoneNumber();
         // 判断此用户是否已注册小程序账号
-        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber);
+        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, dto.getMerchantId());
         if (memberBasicInfo == null) {
             throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
         }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java
index a0c98343b..f33ec7dce 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java
@@ -62,7 +62,7 @@ public class PileStationWhitelistServiceImpl implements IPileStationWhitelistSer
 		if (StringUtils.isBlank(pileStationWhitelist.getMobileNumber())) {
 			throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
 		}
-		MemberBasicInfo memberInfo = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber());
+		MemberBasicInfo memberInfo = memberBasicInfoService.selectInfoByMobileNumber(pileStationWhitelist.getMobileNumber(), pileStationWhitelist.getMerchantId());
 		if (memberInfo == null) {
 			throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_FOUND_ERROR);
 		}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml
index 6ce1738e3..d33ebdf81 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationWhitelistMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="com.jsowell.pile.domain.PileStationWhitelist" id="PileStationWhitelistResult">
         <result property="id"    column="id"    />
+        <result property="merchantId"    column="merchant_id"    />
         <result property="stationId"    column="station_id"    />
         <result property="memberId"    column="member_id"    />
         <result property="mobileNumber"    column="mobile_number"    />
@@ -17,7 +18,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, station_id, member_id, mobile_number, create_time, create_by, update_time, update_by, del_flag
+        id, merchant_id, station_id, member_id, mobile_number, create_time, create_by, update_time, update_by, del_flag
     </sql>
     
     <sql id="selectPileStationWhitelistVo">
@@ -29,6 +30,7 @@
     <select id="selectPileStationWhitelistList" parameterType="com.jsowell.pile.domain.PileStationWhitelist" resultMap="PileStationWhitelistResult">
         <include refid="selectPileStationWhitelistVo"/>
         <where>
+            <if test="merchantId != null  and merchantId != ''"> and merchant_id = #{merchantId}</if>
             <if test="stationId != null  and stationId != ''"> and station_id = #{stationId}</if>
             <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
             <if test="mobileNumber != null  and mobileNumber != ''"> and mobile_number = #{mobileNumber}</if>
@@ -44,6 +46,7 @@
         insert into pile_station_whitelist
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="merchantId != null">merchant_id,</if>
             <if test="stationId != null">station_id,</if>
             <if test="memberId != null">member_id,</if>
             <if test="mobileNumber != null">mobile_number,</if>
@@ -55,6 +58,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="merchantId != null">#{merchantId},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="memberId != null">#{memberId},</if>
             <if test="mobileNumber != null">#{mobileNumber},</if>
@@ -69,6 +73,7 @@
     <update id="updatePileStationWhitelist" parameterType="com.jsowell.pile.domain.PileStationWhitelist">
         update pile_station_whitelist
         <trim prefix="SET" suffixOverrides=",">
+            <if test="merchantId != null">merchant_id = #{merchantId},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="memberId != null">member_id = #{memberId},</if>
             <if test="mobileNumber != null">mobile_number = #{mobileNumber},</if>