refactor(payment): 阶段7 controller 按领域归位, web 瘦身为跨域聚合层

- 单一领域归属 controller 从 web 归各领域(垂直切片):

  merchant/controller/{admin,mch}, masterdata/controller/admin, channel/controller/admin,

  device/<x>/controller/admin, core/controller/admin

- 跨域 controller(依赖 2+ 域)留 web: MerchantChannelMerchantAdmin(channel+masterdata), PayRouteAdmin(masterdata+merchant)

- 依赖 old/跨域的支付 controller 留 web/unipay: UniTrade(core+merchant), UniQuery/UniSync/ChannelAuth/TestCallback(依赖 old, 重写后再定归属)

- 开发工具 develop(跨 core+masterdata+merchant)重组至 web/develop

- web 从 50 文件瘦身至 20(只留跨域/工具/old)

- core 零业务依赖仍达标(core/controller/admin 仅注入 core AdminService)

- payment-common 编译通过

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;