From 0b1f7bd30e5cae5f8156bcbff5bb4c6ddb9da2e0 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Tue, 28 Oct 2025 10:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=B3=A8=E5=86=8C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=AF=86=E7=A0=81=E7=9F=AD=E4=BF=A1=EF=BC=8C=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E5=85=A5=E9=A9=BB=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AccountUserBaseServiceImpl.java | 2 +- .../common/utils/phone/PhoneNumberUtils.java | 2 + .../impl/EsignPlatformInfoServiceImpl.java | 44 +++++++++++++------ .../service/impl/ShopMchEntryServiceImpl.java | 4 +- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java index 05344de3..3e0008c3 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java @@ -1953,7 +1953,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl smsArgs = new HashMap<>(); smsArgs.put("password", user_password_src); - sendSmsMessage(PhoneNumberUtils.cleanPhoneNumber(user_mobile), "SMS_481085172", smsArgs); + sendSmsMessage(PhoneNumberUtils.cleanPhoneNumber(user_mobile), "SMS_496910525", smsArgs); // SMS_496910525 } //初次注册发送消息 diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/phone/PhoneNumberUtils.java b/mall-common/src/main/java/com/suisung/mall/common/utils/phone/PhoneNumberUtils.java index 454ae152..3bc93a46 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/utils/phone/PhoneNumberUtils.java +++ b/mall-common/src/main/java/com/suisung/mall/common/utils/phone/PhoneNumberUtils.java @@ -352,6 +352,8 @@ public class PhoneNumberUtils { System.out.println(cleanPhoneNumber("+3541234567")); // 期望输出: 1234567 System.out.println(cleanPhoneNumber("+85298765432")); + System.out.println(PhoneNumberUtils.checkPhoneNumber("+8617777525395")); + } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java index d81b84c9..6aa55a76 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java @@ -178,26 +178,44 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl 手机号和营业执照号的键值对，获取失败时返回null */ @Override public Pair getEsignPlatformMobileAndLicenseNumber() { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("level", 0).select("telephone", "license_number", "legal_person_mobile"); - List esignPlatformInfos = list(queryWrapper); - if (CollectionUtil.isEmpty(esignPlatformInfos)) { + log.debug("[获取平台方信息] 开始获取平台方手机号和营业执照号"); + + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("level", 0) + .eq("status", CommonConstant.Enable) + .select("telephone", "license_number", "legal_person_mobile"); + + EsignPlatformInfo esignPlatformInfo = findOne(queryWrapper); + if (esignPlatformInfo == null) { + log.warn("[获取平台方信息] 未找到有效的平台方记录"); + return null; + } + + // 优先使用telephone字段，如验证失败则使用legal_person_mobile + String mobile = esignPlatformInfo.getTelephone(); + if (!PhoneNumberUtils.checkPhoneNumber(mobile) + && StrUtil.isNotBlank(esignPlatformInfo.getLegal_person_mobile()) + && PhoneNumberUtils.checkPhoneNumber(esignPlatformInfo.getLegal_person_mobile())) { + log.debug("[获取平台方信息] 主手机号验证失败，使用法人手机号"); + mobile = esignPlatformInfo.getLegal_person_mobile(); + } + + log.debug("[获取平台方信息] 成功获取平台方信息，手机号：{}，营业执照号：{}", + mobile, esignPlatformInfo.getLicense_number()); + return Pair.of(mobile, esignPlatformInfo.getLicense_number()); + + } catch (Exception e) { + log.error("[获取平台方信息] 查询平台方信息时发生异常", e); return null; } - - EsignPlatformInfo esignPlatformInfo = esignPlatformInfos.get(0); - String mobile = esignPlatformInfo.getTelephone(); - if (!PhoneNumberUtils.checkPhoneNumber(mobile) && StrUtil.isNotBlank(esignPlatformInfo.getLegal_person_mobile())) { - mobile = esignPlatformInfo.getLegal_person_mobile(); - } - - return Pair.of(mobile, esignPlatformInfo.getLicense_number()); } + /** * 根据入驻编号获取商户的二级代理 * diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java index 1605ea04..4e91b649 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java @@ -337,7 +337,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl mobileAndLicenseNumber = esignPlatformInfoService.getEsignPlatformMobileAndLicenseNumber(); if (mobileAndLicenseNumber != null) { Map tmplArgs = new HashMap<>(1); - tmplArgs.put("name", record.getBiz_license_company()); // 商家公司名称 + tmplArgs.put("name", record.getStore_name()); // 商家店铺名 shopMessageTemplateService.aliyunSmsSend(mobileAndLicenseNumber.getFirst(), "SMS_486545331", tmplArgs); } @@ -462,7 +462,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl mobileAndLicenseNumber = esignPlatformInfoService.getEsignPlatformMobileAndLicenseNumber(); if (mobileAndLicenseNumber != null) { - String mchName = StrUtil.isBlank(record.getBiz_license_company()) ? "重新修正" : record.getBiz_license_company(); + String mchName = StrUtil.isBlank(record.getStore_name()) ? "重新修正资料" : record.getStore_name(); Map tmplArgs = new HashMap<>(1); tmplArgs.put("name", mchName); // 商家公司名称 // 尊敬的管理员，商家 ${name}，提交了入驻我们平台的申请，请及时对相关资质材料予以审核，以便推进后续流程。