From 153404729b6b341626590e98da00a516cec836c8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 8 Dec 2023 09:44:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java | 4 ++-- .../com/jsowell/pile/service/IMemberBasicInfoService.java | 4 ++-- .../pile/service/impl/MemberBasicInfoServiceImpl.java | 6 +++--- .../main/resources/mapper/pile/MemberBasicInfoMapper.xml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java index a12b5cb83..cbae5cacf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java @@ -72,10 +72,10 @@ public interface MemberBasicInfoMapper { * 不同手机号可以在多个运营商下注册账号 * * @param mobileNumber 手机号 - * @param merchantId 运营商id + * @param firstMerchantId 运营商id * @return 会员信息 */ - MemberBasicInfo selectInfoByMobileNumberAndMerchantId(@Param("mobileNumber") String mobileNumber, @Param("merchantId") String merchantId); + MemberBasicInfo selectInfoByMobileNumberAndMerchantId(@Param("mobileNumber") String mobileNumber, @Param("firstMerchantId") String firstMerchantId); /** * 通过手机号码查询会员信息 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 e0a74e2e2..6a7b28eb0 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 @@ -70,10 +70,10 @@ public interface IMemberBasicInfoService { /** * 根据手机号和运营商id查询会员信息 * @param phone 手机号 mobile number - * @param merchantId 运营商id + * @param firstMerchantId 一级运营商id * @return 会员信息 */ - MemberBasicInfo selectInfoByMobileNumber(String phone, String merchantId); + MemberBasicInfo selectInfoByMobileNumber(String phone, String firstMerchantId); /** * 根据手机号查询会员信息 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 8f099aa51..a78768270 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 @@ -158,12 +158,12 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { /** * 根据手机号和运营商id查询会员信息 * @param mobileNumber 手机号 - * @param merchantId 所属运营商 运营商id + * @param firstMerchantId 所属一级运营商 运营商id * @return 会员信息 */ @Override - public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber, String merchantId) { - return memberBasicInfoMapper.selectInfoByMobileNumberAndMerchantId(mobileNumber, merchantId); + public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber, String firstMerchantId) { + return memberBasicInfoMapper.selectInfoByMobileNumberAndMerchantId(mobileNumber, firstMerchantId); } // @Override diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 8b451a15c..6f01903f9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -154,8 +154,8 @@ from member_basic_info where del_flag = '0' and mobile_number = #{mobileNumber,jdbcType=VARCHAR} - - and merchant_id = #{merchantId,jdbcType=VARCHAR} + + and merchant_id = #{firstMerchantId,jdbcType=VARCHAR} order by create_time DESC, update_time DESC