From 51a5d802cbe7d26abbccff60bcca17a40fcce55c Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 20 Jul 2026 13:22:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(merchant):=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=BA=94=E7=94=A8/=E9=97=A8=E5=BA=97=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=95=86=E6=88=B7=E7=AE=80=E7=A7=B0=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 创建商户时(运营端创建 + 商户自助注册), 默认应用名与默认门店名 由 mchName(全称) 改为 mchShortName(简称) 拼接 i18n 模板, 名称更简短; 同步更新 createDefaultApp/createDefaultStore 形参名与注释为 mchShortName, 保持语义一致。 --- .../service/merchant/info/MerchantAdminService.java | 4 ++-- .../merchant/service/appinfo/MchAppInfoService.java | 10 +++++----- .../merchant/service/store/MchStoreInfoService.java | 8 ++++---- .../merchant/service/user/MerchantUserService.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java index ce6d15d90..0b83ae24e 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java @@ -121,9 +121,9 @@ public class MerchantAdminService { this.createMerchantAdmin(param, merchant); merchantInfoManager.save(merchant); // 创建默认应用（名称按请求语言） - mchAppInfoService.createDefaultApp(merchant.getMchNo(), merchant.getMchName()); + mchAppInfoService.createDefaultApp(merchant.getMchNo(), merchant.getMchShortName()); // 创建默认门店（名称按请求语言） - mchStoreInfoService.createDefaultStore(merchant.getMchNo(), merchant.getMchName(), param.getPhone()); + mchStoreInfoService.createDefaultStore(merchant.getMchNo(), merchant.getMchShortName(), param.getPhone()); } /// 创建商户管理员 diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java index 67980e0d5..87396a6a1 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java @@ -85,12 +85,12 @@ public class MchAppInfoService { /// 为商户创建默认应用（启用 + defaultApp=true；名称按当前请求语言生成） /// - /// @param mchNo 商户号 - /// @param mchName 商户名称（用于生成默认应用名） - public void createDefaultApp(String mchNo, String mchName) { + /// @param mchNo 商户号 + /// @param mchShortName 商户简称（用于生成默认应用名） + public void createDefaultApp(String mchNo, String mchShortName) { MchAppInfo mchApp = new MchAppInfo(); - // 默认应用名称（payment.merchant.defaultAppName，{0}=商户名） - mchApp.setAppName(I18nUtil.get("payment.merchant.defaultAppName", mchName)); + // 默认应用名称（payment.merchant.defaultAppName，{0}=商户简称） + mchApp.setAppName(I18nUtil.get("payment.merchant.defaultAppName", mchShortName)); mchApp.setDefaultApp(true); mchApp.setStatus(MchAppStatusEnum.ENABLE.getCode()); mchApp.setAppId(this.generateAppId()); diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java index 05d6ef2ff..2118b129c 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java @@ -73,12 +73,12 @@ public class MchStoreInfoService { /// 为商户创建默认门店（启用 + defaultStore=true；名称按当前请求语言生成） /// /// @param mchNo 商户号 - /// @param mchName 商户名称（用于生成默认门店名） + /// @param mchShortName 商户简称（用于生成默认门店名） /// @param contactPhone 联系电话（可空） - public void createDefaultStore(String mchNo, String mchName, String contactPhone) { + public void createDefaultStore(String mchNo, String mchShortName, String contactPhone) { MchStoreInfo store = new MchStoreInfo(); - // 默认门店名称（payment.merchant.defaultStoreName，{0}=商户名） - store.setStoreName(I18nUtil.get("payment.merchant.defaultStoreName", mchName)); + // 默认门店名称（payment.merchant.defaultStoreName，{0}=商户简称） + store.setStoreName(I18nUtil.get("payment.merchant.defaultStoreName", mchShortName)); store.setContactPhone(contactPhone); store.setStatus(StoreStatusEnum.ENABLE.getCode()); store.setDefaultStore(true); diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java index 48a32ea8a..ae8f884e6 100644 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java +++ b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java @@ -77,9 +77,9 @@ public class MerchantUserService { this.createMerchantAdmin(param, merchant); merchantInfoManager.save(merchant); // 创建默认应用（名称按请求语言） - mchAppInfoService.createDefaultApp(merchant.getMchNo(), merchant.getMchName()); + mchAppInfoService.createDefaultApp(merchant.getMchNo(), merchant.getMchShortName()); // 创建默认门店（名称按请求语言） - mchStoreInfoService.createDefaultStore(merchant.getMchNo(), merchant.getMchName(), param.getPhone()); + mchStoreInfoService.createDefaultStore(merchant.getMchNo(), merchant.getMchShortName(), param.getPhone()); } /// 创建商户管理员