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()); } /// 创建商户管理员