diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java index 84bf0275f..84aaed6ce 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java @@ -27,7 +27,7 @@ import java.util.List; @Validated @Tag(name = "商户应用配置(管理)") @RestController -@RequestMapping("/admin/mch/app-info") +@RequestMapping("/admin/merchant/app-info") @RequiredArgsConstructor public class MchAppInfoAdminController { private final MchAppInfoService mchAppInfoService; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java index 23d84acae..cef0f5e91 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MchAppNotifyConfigAdminController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; @RestController /// 双路径: 运营端 /admin/... 与商户端 /mch/... 共用同一 Service; /// 客户端隔离由网关 ClientCode + @PermCode 菜单权限保证;商户端 TenantLine 按 mchNo 行级隔离。 -@RequestMapping({"/admin/merchant/app-notify-config", "/mch/merchant/app-notify-config"}) +@RequestMapping({"/admin/merchant/app-notify-config", "/mch/app-notify-config"}) @RequiredArgsConstructor public class MchAppNotifyConfigAdminController { diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java index ffb8186a1..d2f425236 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "门店信息管理(管理端)") @RestController -@RequestMapping("/admin/mch/store") +@RequestMapping("/admin/merchant/store") @RequiredArgsConstructor public class MchStoreInfoAdminController { private final MchStoreInfoService mchStoreInfoService; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/wxverify/WxDomainVerifyAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/wxverify/WxDomainVerifyAdminController.java index fd59b1acc..19d034842 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/wxverify/WxDomainVerifyAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/wxverify/WxDomainVerifyAdminController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "商户微信域名验证文件(管理)") @RestController -@RequestMapping("/admin/mch/wx-verify") +@RequestMapping("/admin/merchant/wx-verify") @RequiredArgsConstructor public class WxDomainVerifyAdminController { private final WxDomainVerifyService wxDomainVerifyService; diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/MchNoticeAdminController.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/MchNoticeAdminController.java index 826c947ef..fd9a2d8d0 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/MchNoticeAdminController.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/trade/MchNoticeAdminController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户出站通知(管理)") @RestController -@RequestMapping("/admin/mch-notice") +@RequestMapping("/admin/merchant-notice") @RequiredArgsConstructor public class MchNoticeAdminController { diff --git a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/appinfo/AppAdminMchAppInfoController.java b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/appinfo/AppAdminMchAppInfoController.java index e7abfd6a5..24b014715 100644 --- a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/appinfo/AppAdminMchAppInfoController.java +++ b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/appinfo/AppAdminMchAppInfoController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "运营移动端-商户应用配置") @RestController -@RequestMapping("/app-admin/mch/app-info") +@RequestMapping("/app-admin/merchant/app-info") @RequiredArgsConstructor public class AppAdminMchAppInfoController { diff --git a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/store/AppAdminMchStoreInfoController.java b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/store/AppAdminMchStoreInfoController.java index 7f3010147..0d87cd396 100644 --- a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/store/AppAdminMchStoreInfoController.java +++ b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/merchant/store/AppAdminMchStoreInfoController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "运营移动端-门店信息管理") @RestController -@RequestMapping("/app-admin/mch/store") +@RequestMapping("/app-admin/merchant/store") @RequiredArgsConstructor public class AppAdminMchStoreInfoController { diff --git a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/trade/AppAdminMchNoticeController.java b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/trade/AppAdminMchNoticeController.java index 7f9a19c8b..515851183 100644 --- a/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/trade/AppAdminMchNoticeController.java +++ b/daxpay-payment/daxpay-payment-app-admin/src/main/java/cn/daxpay/open/payment/app/admin/controller/trade/AppAdminMchNoticeController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户出站通知(运营移动端)") @RestController -@RequestMapping("/app-admin/mch-notice") +@RequestMapping("/app-admin/merchant-notice") @RequiredArgsConstructor public class AppAdminMchNoticeController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/channel/AppMerchantChannelMerchantController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/channel/AppMerchantChannelMerchantController.java index ba7f2992a..fc5868dfe 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/channel/AppMerchantChannelMerchantController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/channel/AppMerchantChannelMerchantController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "通道商户管理(商户移动端)") @RestController -@RequestMapping("/app-merchant/channel-merchant") +@RequestMapping("/app-mch/channel-merchant") @RequiredArgsConstructor public class AppMerchantChannelMerchantController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantAppNotifyConfigController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantAppNotifyConfigController.java index a83225a85..6b605fb6a 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantAppNotifyConfigController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantAppNotifyConfigController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户应用事件通知配置(商户移动端)") @RestController -@RequestMapping("/app-merchant/merchant/app-notify-config") +@RequestMapping("/app-mch/app-notify-config") @RequiredArgsConstructor public class AppMerchantAppNotifyConfigController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantCredentialController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantCredentialController.java index 2eecd2fbf..57920de9e 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantCredentialController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/config/AppMerchantCredentialController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户API对接配置(商户移动端)") @RestController -@RequestMapping("/app-merchant/merchant/credential") +@RequestMapping("/app-mch/credential") @RequiredArgsConstructor public class AppMerchantCredentialController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/dashboard/AppMerchantDashboardTradeController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/dashboard/AppMerchantDashboardTradeController.java index 14452b7cc..82b517195 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/dashboard/AppMerchantDashboardTradeController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/dashboard/AppMerchantDashboardTradeController.java @@ -30,7 +30,7 @@ import java.util.List; @Tag(name = "工作台交易统计(商户移动端)") @Validated @RestController -@RequestMapping("/app-merchant/dashboard/trade") +@RequestMapping("/app-mch/dashboard/trade") @RequiredArgsConstructor public class AppMerchantDashboardTradeController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayCashierController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayCashierController.java index 7b231ae14..7609dda54 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayCashierController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayCashierController.java @@ -30,7 +30,7 @@ import java.util.List; @Validated @Tag(name = "网关收银台配置(商户移动端)") @RestController -@RequestMapping("/app-merchant/gateway/cashier-config") +@RequestMapping("/app-mch/gateway/cashier-config") @RequiredArgsConstructor public class AppMerchantGatewayCashierController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayPayConfigController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayPayConfigController.java index 672ebee7d..6df46a4d8 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayPayConfigController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/gateway/AppMerchantGatewayPayConfigController.java @@ -30,7 +30,7 @@ import java.util.List; @Validated @Tag(name = "网关支付配置(商户移动端)") @RestController -@RequestMapping("/app-merchant/gateway/pay-config") +@RequestMapping("/app-mch/gateway/pay-config") @RequiredArgsConstructor public class AppMerchantGatewayPayConfigController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantAppInfoController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantAppInfoController.java index 06060dfa5..d0ed9a1a6 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantAppInfoController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantAppInfoController.java @@ -28,7 +28,7 @@ import java.util.List; @Validated @Tag(name = "商户应用配置(商户移动端)") @RestController -@RequestMapping("/app-merchant/app-info") +@RequestMapping("/app-mch/app-info") @RequiredArgsConstructor public class AppMerchantAppInfoController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantInfoController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantInfoController.java index fe84bae27..6289d4498 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantInfoController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/info/AppMerchantInfoController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户信息(商户移动端)") @RestController -@RequestMapping("/app-merchant/merchant") +@RequestMapping("/app-mch/merchant") @RequiredArgsConstructor public class AppMerchantInfoController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/route/AppMerchantPayRouteController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/route/AppMerchantPayRouteController.java index a9e8db3c3..f4ff1401b 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/route/AppMerchantPayRouteController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/route/AppMerchantPayRouteController.java @@ -37,7 +37,7 @@ import java.util.Map; @Validated @Tag(name = "应用通道路由管理(商户移动端)") @RestController -@RequestMapping("/app-merchant/pay-route") +@RequestMapping("/app-mch/pay-route") @RequiredArgsConstructor public class AppMerchantPayRouteController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/store/AppMerchantStoreInfoController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/store/AppMerchantStoreInfoController.java index 1d06686b0..879a55a6f 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/store/AppMerchantStoreInfoController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/store/AppMerchantStoreInfoController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "门店信息管理(商户移动端)") @RestController -@RequestMapping("/app-merchant/store") +@RequestMapping("/app-mch/store") @RequiredArgsConstructor public class AppMerchantStoreInfoController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantGatewayPayOrderController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantGatewayPayOrderController.java index a904763f3..db4269b95 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantGatewayPayOrderController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantGatewayPayOrderController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "网关支付业务单(商户移动端)") @RestController -@RequestMapping("/app-merchant/order/gateway-pay") +@RequestMapping("/app-mch/order/gateway-pay") @RequiredArgsConstructor public class AppMerchantGatewayPayOrderController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantMchNoticeController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantMchNoticeController.java index 4e12465ed..bb7fe949e 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantMchNoticeController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantMchNoticeController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户出站通知(商户移动端)") @RestController -@RequestMapping("/app-merchant/mch-notice") +@RequestMapping("/app-mch/notice") @RequiredArgsConstructor public class AppMerchantMchNoticeController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantNormalPayOrderController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantNormalPayOrderController.java index 02004ddf7..be0cb3046 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantNormalPayOrderController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantNormalPayOrderController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "普通支付业务单(商户移动端)") @RestController -@RequestMapping("/app-merchant/order/normal-pay") +@RequestMapping("/app-mch/order/normal-pay") @RequiredArgsConstructor public class AppMerchantNormalPayOrderController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayCallbackRecordController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayCallbackRecordController.java index 446b9c171..047267344 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayCallbackRecordController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayCallbackRecordController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "通道入站回调记录(商户移动端)") @RestController -@RequestMapping("/app-merchant/callback-record") +@RequestMapping("/app-mch/callback-record") @RequiredArgsConstructor public class AppMerchantPayCallbackRecordController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayTradeController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayTradeController.java index d303bf281..899231e6d 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayTradeController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantPayTradeController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "资金交易凭证(商户移动端)") @RestController -@RequestMapping("/app-merchant/order/pay-trade") +@RequestMapping("/app-mch/order/pay-trade") @RequiredArgsConstructor public class AppMerchantPayTradeController { diff --git a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantRefundOrderController.java b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantRefundOrderController.java index fbfebb1f8..8a96e7bf5 100644 --- a/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantRefundOrderController.java +++ b/daxpay-payment/daxpay-payment-app-merchant/src/main/java/cn/daxpay/open/payment/app/merchant/controller/trade/AppMerchantRefundOrderController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "退款订单(商户移动端)") @RestController -@RequestMapping("/app-merchant/order/refund") +@RequestMapping("/app-mch/order/refund") @RequiredArgsConstructor public class AppMerchantRefundOrderController { diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java index f800b0f13..34799f4ff 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "商户API对接配置") @RestController -@RequestMapping("/merchant/credential") +@RequestMapping("/mch/credential") @RequiredArgsConstructor public class MerchantCredentialController { private final MerchantCredentialService credentialService; diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java index 4ddf83f79..ba5bf77af 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java @@ -30,7 +30,9 @@ import java.util.List; @Validated @Tag(name = "商户用户管理") @RestController -@RequestMapping("/merchant/user") +/// 双路径: 运营端 /admin/merchant/user 与商户端 /mch/user 共用同一 Service; + /// 客户端隔离由 ClientCode + @PermCode 保证;商户端 TenantLine 按 mchNo 行级隔离。 + @RequestMapping({"/admin/merchant/user", "/mch/user"}) @RequiredArgsConstructor public class MchUserAdminController { diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java index 5b2e54b8d..0e4941396 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户信息") @RestController -@RequestMapping("/merchant") +@RequestMapping("/mch/merchant") @RequiredArgsConstructor public class MerchantController { private final MerchantInfoService merchantInfoService; diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java index dcf2a95fe..0d6c64a3e 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; @IgnoreAuth @Tag(name = "商户管理") @RestController -@RequestMapping("/merchant/user") +@RequestMapping("/mch/user") @RequiredArgsConstructor public class MerchantUserController { private final MerchantUserService merchantUserService; diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java deleted file mode 100644 index 2af3fed26..000000000 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.daxpay.open.payment.merchant.controller.miniapp; - -import cn.daxpay.open.platform.core.rest.Res; -import cn.daxpay.open.platform.core.rest.dto.LabelValue; -import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.payment.merchant.result.appinfo.MchAppInfoResult; -import cn.daxpay.open.payment.merchant.result.info.MerchantInfoResult; -import cn.daxpay.open.payment.merchant.service.miniapp.MiniMchBasicService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/// # 小程序基础接口 -/// -@Validated -@Tag(name = "小程序基础接口") -@RestController -@RequestMapping("/mini/mch") -@RequiredArgsConstructor -public class MiniMchBasicController { - private final MiniMchBasicService miniAppBasicService; - - @Operation(summary = "查询商户信息") - @GetMapping("/find-mch-info") - public Result findMchInfo(){ - return Res.ok(miniAppBasicService.findMchInfo()); - } - - @Operation(summary = "所有商户应用下拉列表") - @GetMapping("/dropdown-mch-app") - public Result> dropdownMchApp(){ - return Res.ok(miniAppBasicService.dropdownMchApp()); - } - - @Operation(summary = "查询默认应用") - @GetMapping("/find-default-mch-app") - public Result findDefaultMchApp(){ - return Res.ok(miniAppBasicService.findDefaultMchApp()); - } -} diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java deleted file mode 100644 index ef006fe64..000000000 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.daxpay.open.payment.merchant.controller.miniapp; - -import cn.daxpay.open.platform.core.rest.Res; -import cn.daxpay.open.platform.core.rest.result.PageResult; -import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.payment.trade.order.result.NormalPayOrderResult; -import cn.daxpay.open.payment.merchant.param.miniapp.order.MiniPayOrderQuery; -import cn.daxpay.open.payment.merchant.service.miniapp.MiniMchOrderQueryService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/// # 小程序订单查询 -/// -@Validated -@Tag(name = "小程序订单查询") -@RestController -@RequestMapping("/mini/mch/order/query") -@RequiredArgsConstructor -public class MiniMchOrderQueryController { - private final MiniMchOrderQueryService miniAppOrderQueryService; - - @Operation(summary = "支付订单分页") - @PostMapping("/page-by-pay") - public Result> pageByPay(@RequestBody MiniPayOrderQuery query) { - return Res.ok(miniAppOrderQueryService.pageByPay(query)); - } - - @Operation(summary = "支付订单详情") - @GetMapping("/find-pay-order-by-id") - public Result findPayOrderById(@NotNull(message = "{validation.field.id.notNull}") Long id) { - return Res.ok(miniAppOrderQueryService.findPayOrderById(id)); - } - - @Operation(summary = "根据编号查询支付订单详情") - @GetMapping("/find-pay-order-by-no") - public Result findPayOrderByNo(@NotBlank(message = "{validation.field.orderNo.notBlank}") String orderNo, - @NotBlank(message = "{validation.field.appId.notBlank}") String appId) { - return Res.ok(miniAppOrderQueryService.findPayOrderByNo(orderNo,appId)); - } - -} diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/trade/MchNoticeController.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/trade/MchNoticeController.java index d6e2efa5e..b8da59dba 100644 --- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/trade/MchNoticeController.java +++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/trade/MchNoticeController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "商户出站通知(商户端)") @RestController -@RequestMapping("/mch/mch-notice") +@RequestMapping("/mch/notice") @RequiredArgsConstructor public class MchNoticeController { diff --git a/daxpay-platform/daxpay-platform-capability/capability-sensitive-word/src/main/java/cn/daxpay/open/platform/capability/sensitiveword/service/SensitiveWordCheckService.java b/daxpay-platform/daxpay-platform-capability/capability-sensitive-word/src/main/java/cn/daxpay/open/platform/capability/sensitiveword/service/SensitiveWordCheckService.java index 9f601b143..3c6eabf18 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-sensitive-word/src/main/java/cn/daxpay/open/platform/capability/sensitiveword/service/SensitiveWordCheckService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-sensitive-word/src/main/java/cn/daxpay/open/platform/capability/sensitiveword/service/SensitiveWordCheckService.java @@ -167,7 +167,8 @@ public class SensitiveWordCheckService { if (path.startsWith("/admin/")) { return SensitiveWordSourceEnum.ADMIN.getCode(); } - if (path.startsWith("/merchant/")) { + // 商户端: /mch/ (Web) 与 /app-mch/ (小程序) 均归 MERCHANT 来源 + if (path.startsWith("/mch/") || path.startsWith("/app-mch/")) { return SensitiveWordSourceEnum.MERCHANT.getCode(); } if (path.startsWith("/app-admin/")) { diff --git a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayConfigController.java b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayConfigController.java index 52595ea7b..d55b07fff 100644 --- a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayConfigController.java +++ b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayConfigController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "易支付场景配置") @RestController -@RequestMapping({"/admin/easypay/config", "/merchant/easypay/config"}) +@RequestMapping({"/admin/easypay/config", "/mch/easypay/config"}) @RequiredArgsConstructor public class EasyPayConfigController { diff --git a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayCredentialController.java b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayCredentialController.java index a7172fa22..13f3f58d3 100644 --- a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayCredentialController.java +++ b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/config/EasyPayCredentialController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; @Validated @Tag(name = "易支付凭证配置") @RestController -@RequestMapping({"/admin/easypay/credential", "/merchant/easypay/credential"}) +@RequestMapping({"/admin/easypay/credential", "/mch/easypay/credential"}) @RequiredArgsConstructor public class EasyPayCredentialController { diff --git a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayOrderMchController.java b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayOrderMchController.java index a870f4a53..ab3ae8d5c 100644 --- a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayOrderMchController.java +++ b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayOrderMchController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "易支付协议订单(商户端)") @RestController -@RequestMapping("/merchant/easypay/order") +@RequestMapping("/mch/easypay/order") @RequiredArgsConstructor public class EasyPayOrderMchController { diff --git a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayRefundOrderMchController.java b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayRefundOrderMchController.java index eee892249..121461e6b 100644 --- a/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayRefundOrderMchController.java +++ b/daxpay-plugin/daxpay-plugin-easypay/src/main/java/cn/daxpay/open/plugin/easypay/controller/order/EasyPayRefundOrderMchController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @Tag(name = "易支付协议退款订单(商户端)") @RestController -@RequestMapping("/merchant/easypay/refund") +@RequestMapping("/mch/easypay/refund") @RequiredArgsConstructor public class EasyPayRefundOrderMchController {