diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/channel/info/ChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/controller/admin/info/ChannelMerchantAdminController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/channel/info/ChannelMerchantAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/controller/admin/info/ChannelMerchantAdminController.java index 57e7f97ad..dc9ad32f6 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/channel/info/ChannelMerchantAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/channel/controller/admin/info/ChannelMerchantAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.channel.info; +package cn.daxpay.open.payment.channel.controller.admin.info; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/NormalPayOrderAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/NormalPayOrderAdminController.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/NormalPayOrderAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/NormalPayOrderAdminController.java index 2613747c9..b55a6ca32 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/NormalPayOrderAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/NormalPayOrderAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.order; +package cn.daxpay.open.payment.core.controller.admin; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/PayTradeAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/PayTradeAdminController.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/PayTradeAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/PayTradeAdminController.java index 78c3a20d1..c79627084 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/order/PayTradeAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/controller/admin/PayTradeAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.order; +package cn.daxpay.open.payment.core.controller.admin; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/controller/DevicePrinterAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/controller/admin/DevicePrinterAdminController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/controller/DevicePrinterAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/controller/admin/DevicePrinterAdminController.java index 9ee63ea89..a40f47e49 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/controller/DevicePrinterAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/controller/admin/DevicePrinterAdminController.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.web.admin.device.printer.controller; +package cn.daxpay.open.payment.device.printer.controller.admin; -import cn.daxpay.open.payment.web.admin.device.printer.service.DevicePrinterAdminService; +import cn.daxpay.open.payment.device.printer.service.DevicePrinterAdminService; import cn.daxpay.open.payment.device.printer.param.DevicePrinterParam; import cn.daxpay.open.payment.device.printer.param.DevicePrinterQuery; import cn.daxpay.open.payment.device.printer.result.DevicePrinterResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/service/DevicePrinterAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/service/DevicePrinterAdminService.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/service/DevicePrinterAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/service/DevicePrinterAdminService.java index 9cfadf8c7..510737ed9 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/printer/service/DevicePrinterAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/printer/service/DevicePrinterAdminService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.device.printer.service; +package cn.daxpay.open.payment.device.printer.service; import cn.daxpay.open.payment.device.enums.DeviceStatusEnum; import cn.daxpay.open.payment.device.enums.DeviceVendorEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/controller/DeviceSpeakerAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/controller/admin/DeviceSpeakerAdminController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/controller/DeviceSpeakerAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/controller/admin/DeviceSpeakerAdminController.java index 177bbde9b..f1021af04 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/controller/DeviceSpeakerAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/controller/admin/DeviceSpeakerAdminController.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.web.admin.device.speaker.controller; +package cn.daxpay.open.payment.device.speaker.controller.admin; -import cn.daxpay.open.payment.web.admin.device.speaker.service.DeviceSpeakerAdminService; +import cn.daxpay.open.payment.device.speaker.service.DeviceSpeakerAdminService; import cn.daxpay.open.payment.device.speaker.param.DeviceSpeakerParam; import cn.daxpay.open.payment.device.speaker.param.DeviceSpeakerQuery; import cn.daxpay.open.payment.device.speaker.result.DeviceSpeakerResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/service/DeviceSpeakerAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/service/DeviceSpeakerAdminService.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/service/DeviceSpeakerAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/service/DeviceSpeakerAdminService.java index 7a056cfa6..101ace737 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/speaker/service/DeviceSpeakerAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/speaker/service/DeviceSpeakerAdminService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.device.speaker.service; +package cn.daxpay.open.payment.device.speaker.service; import cn.daxpay.open.payment.device.enums.DeviceStatusEnum; import cn.daxpay.open.payment.device.enums.DeviceVendorEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/controller/DeviceVendorConfigAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/controller/admin/DeviceVendorConfigAdminController.java similarity index 95% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/controller/DeviceVendorConfigAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/controller/admin/DeviceVendorConfigAdminController.java index 977f02c88..49ae5bd79 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/controller/DeviceVendorConfigAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/controller/admin/DeviceVendorConfigAdminController.java @@ -1,6 +1,6 @@ -package cn.daxpay.open.payment.web.admin.device.vendor.controller; +package cn.daxpay.open.payment.device.vendor.controller.admin; -import cn.daxpay.open.payment.web.admin.device.vendor.service.DeviceVendorConfigAdminService; +import cn.daxpay.open.payment.device.vendor.service.DeviceVendorConfigAdminService; import cn.daxpay.open.payment.device.vendor.param.DeviceVendorConfigParam; import cn.daxpay.open.payment.device.vendor.param.DeviceVendorConfigQuery; import cn.daxpay.open.payment.device.vendor.result.DeviceVendorConfigResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/service/DeviceVendorConfigAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/service/DeviceVendorConfigAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java index ea56933c6..1794947f7 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/device/vendor/service/DeviceVendorConfigAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.device.vendor.service; +package cn.daxpay.open.payment.device.vendor.service; import cn.daxpay.open.payment.device.vendor.dao.DeviceVendorConfigManager; import cn.daxpay.open.payment.device.vendor.entity.DeviceVendorConfig; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/capability/PayCapabilityController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/capability/PayCapabilityController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/capability/PayCapabilityController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/capability/PayCapabilityController.java index 503921e59..3a1b479c1 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/capability/PayCapabilityController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/capability/PayCapabilityController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.masterdata.capability; +package cn.daxpay.open.payment.masterdata.controller.admin.capability; import cn.daxpay.open.payment.masterdata.constants.capability.param.PayCapabilityQuery; import cn.daxpay.open.payment.masterdata.constants.capability.result.PayCapabilityResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/channel/PayChannelController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/channel/PayChannelController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/channel/PayChannelController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/channel/PayChannelController.java index f9fbf6426..e547d5a2c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/channel/PayChannelController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/channel/PayChannelController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.masterdata.channel; +package cn.daxpay.open.payment.masterdata.controller.admin.channel; import cn.daxpay.open.payment.masterdata.constants.channel.param.PayChannelQuery; import cn.daxpay.open.payment.masterdata.constants.channel.result.PayChannelResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductConfigController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductConfigController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductConfigController.java index 777d7c392..c64d778ad 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductConfigController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductConfigController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.masterdata.product; +package cn.daxpay.open.payment.masterdata.controller.admin.product; import cn.daxpay.open.payment.masterdata.constants.product.param.PayProductConfigParam; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductConfigResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductController.java index 84e8c9694..dd30f344a 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/product/PayProductController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/product/PayProductController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.masterdata.product; +package cn.daxpay.open.payment.masterdata.controller.admin.product; import cn.daxpay.open.payment.masterdata.constants.product.param.PayProductQuery; import cn.daxpay.open.payment.masterdata.constants.product.result.PayProductResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/provider/PayProviderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/provider/PayProviderController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/provider/PayProviderController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/provider/PayProviderController.java index 27257e117..485c4d7a0 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/masterdata/provider/PayProviderController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/controller/admin/provider/PayProviderController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.masterdata.provider; +package cn.daxpay.open.payment.masterdata.controller.admin.provider; import cn.daxpay.open.payment.masterdata.constants.provider.result.PayProviderGroupResult; import cn.daxpay.open.payment.masterdata.constants.provider.result.PayProviderMethodResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/appinfo/MchAppInfoAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/appinfo/MchAppInfoAdminController.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/appinfo/MchAppInfoAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/appinfo/MchAppInfoAdminController.java index 6750727b5..95135a50b 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/appinfo/MchAppInfoAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/appinfo/MchAppInfoAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.merchant.appinfo; +package cn.daxpay.open.payment.merchant.controller.admin.appinfo; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MchAppNotifyConfigAdminController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MchAppNotifyConfigAdminController.java index a240d7233..59d37d6d3 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MchAppNotifyConfigAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.merchant.config; +package cn.daxpay.open.payment.merchant.controller.admin.config; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MerchantCredentialAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MerchantCredentialAdminController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MerchantCredentialAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MerchantCredentialAdminController.java index f440b15c1..bdedcdad8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/config/MerchantCredentialAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/config/MerchantCredentialAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.merchant.config; +package cn.daxpay.open.payment.merchant.controller.admin.config; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/info/MerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/info/MerchantAdminController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/info/MerchantAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/info/MerchantAdminController.java index 67e00f0cf..2311032bd 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/info/MerchantAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/info/MerchantAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.merchant.info; +package cn.daxpay.open.payment.merchant.controller.admin.info; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; @@ -10,7 +10,7 @@ import cn.daxpay.open.payment.merchant.param.info.MerchantInfoParam; import cn.daxpay.open.payment.merchant.param.info.MerchantInfoQuery; import cn.daxpay.open.payment.merchant.param.info.MerchantRegisterParam; import cn.daxpay.open.payment.merchant.result.info.MerchantInfoResult; -import cn.daxpay.open.payment.web.admin.service.merchant.info.MerchantAdminService; +import cn.daxpay.open.payment.merchant.service.admin.MerchantAdminService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.NotBlank; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/store/MchStoreInfoAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/store/MchStoreInfoAdminController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/store/MchStoreInfoAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/store/MchStoreInfoAdminController.java index 2c4db4b63..be32f93d8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/merchant/store/MchStoreInfoAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/admin/store/MchStoreInfoAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.controller.merchant.store; +package cn.daxpay.open.payment.merchant.controller.admin.store; import cn.daxpay.open.payment.merchant.param.store.MchStoreInfoParam; import cn.daxpay.open.payment.merchant.param.store.MchStoreInfoQuery; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/ChannelConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/ChannelConfigController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java index a27535c69..1acec8a74 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/ChannelConfigController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/ChannelConfigController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.config; +package cn.daxpay.open.payment.merchant.controller.mch.config; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.dto.LabelValue; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/MerchantCredentialController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java similarity index 95% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/MerchantCredentialController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java index 78d7e2013..cce50bf11 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/config/MerchantCredentialController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/config/MerchantCredentialController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.config; +package cn.daxpay.open.payment.merchant.controller.mch.config; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchAppInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchAppInfoController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java index 1402d027b..94ff43d99 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchAppInfoController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchAppInfoController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.info; +package cn.daxpay.open.payment.merchant.controller.mch.info; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.param.PageParam; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchUserAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java similarity index 98% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchUserAdminController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java index 5693fdb21..298db7692 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MchUserAdminController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MchUserAdminController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.info; +package cn.daxpay.open.payment.merchant.controller.mch.info; import cn.daxpay.open.platform.core.annotation.OperateLog; import cn.daxpay.open.platform.core.enums.common.OperateLogType; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java index b132686d5..313571b5c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.info; +package cn.daxpay.open.payment.merchant.controller.mch.info; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantUserController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java similarity index 95% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantUserController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java index 932a93391..0bd105a47 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/info/MerchantUserController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/info/MerchantUserController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.info; +package cn.daxpay.open.payment.merchant.controller.mch.info; import cn.daxpay.open.platform.core.annotation.IgnoreAuth; import cn.daxpay.open.platform.core.rest.Res; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchBasicController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchBasicController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java index 57037925e..9858277ee 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchBasicController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchBasicController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.miniapp; +package cn.daxpay.open.payment.merchant.controller.mch.miniapp; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.dto.LabelValue; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderController.java index ee7e23662..68ad9f32d 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.miniapp; +package cn.daxpay.open.payment.merchant.controller.mch.miniapp; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderQueryController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java similarity index 96% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderQueryController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java index 9aebc2918..863adc8f1 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/miniapp/MiniMchOrderQueryController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/miniapp/MiniMchOrderQueryController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.miniapp; +package cn.daxpay.open.payment.merchant.controller.mch.miniapp; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.PageResult; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/store/MchStoreInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java similarity index 97% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/store/MchStoreInfoController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java index 6431b9098..ba1a5bcb5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/merchant/controller/store/MchStoreInfoController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/mch/store/MchStoreInfoController.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.merchant.controller.store; +package cn.daxpay.open.payment.merchant.controller.mch.store; import cn.daxpay.open.payment.merchant.param.store.MchStoreInfoParam; import cn.daxpay.open.payment.merchant.param.store.MchStoreInfoQuery; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/merchant/info/MerchantAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/admin/MerchantAdminService.java similarity index 99% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/merchant/info/MerchantAdminService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/admin/MerchantAdminService.java index 786565fc2..e6e82128e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/merchant/info/MerchantAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/admin/MerchantAdminService.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.service.merchant.info; +package cn.daxpay.open.payment.merchant.service.admin; import cn.daxpay.open.platform.common.mybatisplus.util.MpUtil; import cn.daxpay.open.platform.core.enums.client.ClientEnum; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopSignController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopSignController.java similarity index 79% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopSignController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopSignController.java index f4211e0d0..6afc7b750 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopSignController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopSignController.java @@ -1,9 +1,9 @@ -package cn.daxpay.open.payment.web.admin.controller.develop; +package cn.daxpay.open.payment.web.develop.controller; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopSignParam; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopVerifyParam; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopSignResult; -import cn.daxpay.open.payment.web.admin.service.develop.DevelopSignService; +import cn.daxpay.open.payment.web.develop.param.DevelopSignParam; +import cn.daxpay.open.payment.web.develop.param.DevelopVerifyParam; +import cn.daxpay.open.payment.web.develop.result.DevelopSignResult; +import cn.daxpay.open.payment.web.develop.service.DevelopSignService; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopTradeController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopTradeController.java similarity index 89% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopTradeController.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopTradeController.java index 73b428cb8..2a7351cac 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/controller/develop/DevelopTradeController.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/controller/DevelopTradeController.java @@ -1,9 +1,9 @@ -package cn.daxpay.open.payment.web.admin.controller.develop; +package cn.daxpay.open.payment.web.develop.controller; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopParam; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopPayResult; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopSignResult; -import cn.daxpay.open.payment.web.admin.service.develop.DevelopTradeService; +import cn.daxpay.open.payment.web.develop.param.DevelopParam; +import cn.daxpay.open.payment.web.develop.result.DevelopPayResult; +import cn.daxpay.open.payment.web.develop.result.DevelopSignResult; +import cn.daxpay.open.payment.web.develop.service.DevelopTradeService; import cn.daxpay.open.payment.masterdata.constants.provider.result.PayProviderMethodResult; import cn.daxpay.open.payment.unipay.param.trade.pay.NormalPayParam; import cn.daxpay.open.platform.core.annotation.PermCode; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopParam.java similarity index 92% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopParam.java index 514cc0b20..2f140c268 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopParam.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.param.develop; +package cn.daxpay.open.payment.web.develop.param; import cn.daxpay.open.payment.unipay.param.MerchantPaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopSignParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopSignParam.java similarity index 89% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopSignParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopSignParam.java index 2551d6da3..a0ec29304 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopSignParam.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopSignParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.param.develop; +package cn.daxpay.open.payment.web.develop.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopVerifyParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopVerifyParam.java similarity index 91% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopVerifyParam.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopVerifyParam.java index d2cdf6bf2..c7b2f2889 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/param/develop/DevelopVerifyParam.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/param/DevelopVerifyParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.param.develop; +package cn.daxpay.open.payment.web.develop.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopPayResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopPayResult.java similarity index 90% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopPayResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopPayResult.java index ada40cfa7..4ed63aa19 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopPayResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopPayResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.result.develop; +package cn.daxpay.open.payment.web.develop.result; import cn.daxpay.open.payment.unipay.result.trade.pay.NormalPayResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopSignResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopSignResult.java similarity index 88% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopSignResult.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopSignResult.java index 165a1d125..0d80cce2f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/result/develop/DevelopSignResult.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/result/DevelopSignResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.payment.web.admin.result.develop; +package cn.daxpay.open.payment.web.develop.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopSignService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopSignService.java similarity index 81% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopSignService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopSignService.java index 5f2d9d4ac..374e74859 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopSignService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopSignService.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.web.admin.service.develop; +package cn.daxpay.open.payment.web.develop.service; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopSignParam; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopVerifyParam; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopSignResult; +import cn.daxpay.open.payment.web.develop.param.DevelopSignParam; +import cn.daxpay.open.payment.web.develop.param.DevelopVerifyParam; +import cn.daxpay.open.payment.web.develop.result.DevelopSignResult; import cn.daxpay.open.payment.common.util.JsonSignStrUtil; import cn.daxpay.open.platform.core.util.RsaSignUtil; import lombok.RequiredArgsConstructor; diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopTradeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopTradeService.java similarity index 94% rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopTradeService.java rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopTradeService.java index ed900e8fb..d2d3568a5 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/admin/service/develop/DevelopTradeService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/web/develop/service/DevelopTradeService.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.payment.web.admin.service.develop; +package cn.daxpay.open.payment.web.develop.service; -import cn.daxpay.open.payment.web.admin.param.develop.DevelopParam; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopPayResult; -import cn.daxpay.open.payment.web.admin.result.develop.DevelopSignResult; +import cn.daxpay.open.payment.web.develop.param.DevelopParam; +import cn.daxpay.open.payment.web.develop.result.DevelopPayResult; +import cn.daxpay.open.payment.web.develop.result.DevelopSignResult; import cn.daxpay.open.payment.common.runtime.PaymentContext; import cn.daxpay.open.payment.common.service.MerchantContextLoader; import cn.daxpay.open.payment.common.service.PaySignService;