diff --git a/daxpay-payment/daxpay-payment-admin/pom.xml b/daxpay-payment/daxpay-payment-admin/pom.xml
deleted file mode 100644
index 55122ded5..000000000
--- a/daxpay-payment/daxpay-payment-admin/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.daxpay.open</groupId>
-        <artifactId>daxpay-payment</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>daxpay-payment-admin</artifactId>
-    <packaging>jar</packaging>
-    <description>多商户支付运营端功能实现</description>
-
-    <dependencies>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 类型转换处理器 -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <scope>provided</scope>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <!-- 类型转换 -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <!-- web框架 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- 支付公共底座 -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>daxpay-payment-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 商户管理 -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>daxpay-payment-merchant</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- 翻译模块 -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>common-translate</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 基础API服务 -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>service-baseapi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 站内通知服务(公告 + 个人消息) -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>service-notify</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- Artemis 消息队列通用模块（供 demo 演示注入 ArtemisTemplateService） -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>common-artemis</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- 打包Excel等资源文件损坏问题 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>docx</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>doc</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.sql</include>
-                    <include>**/*.flt</include>
-                    <include>**/*.xlsx</include>
-                    <include>**/*.xls</include>
-                    <include>**/*.docx</include>
-                    <include>**/*.doc</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-</project>
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java b/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java
deleted file mode 100644
index 9ff346274..000000000
--- a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/DaxpayPaymentAdminApp.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.daxpay.open.payment.admin;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.context.annotation.ComponentScan;
-
-/// # 支付运营端装配入口
-///
-@AutoConfiguration
-@ConfigurationPropertiesScan
-@MapperScan(annotationClass = Mapper.class)
-@ComponentScan
-public class DaxpayPaymentAdminApp {
-}
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index cb617d980..000000000
--- a/daxpay-payment/daxpay-payment-admin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.daxpay.open.payment.admin.DaxpayPaymentAdminApp
diff --git a/daxpay-payment/daxpay-payment-common/pom.xml b/daxpay-payment/daxpay-payment-common/pom.xml
index 29393d010..050394b72 100644
--- a/daxpay-payment/daxpay-payment-common/pom.xml
+++ b/daxpay-payment/daxpay-payment-common/pom.xml
@@ -11,7 +11,7 @@
 
     <artifactId>daxpay-payment-common</artifactId>
     <packaging>jar</packaging>
-    <description>多商户支付核心业务实现</description>
+    <description>多商户支付功能实现（含核心底座、运营端、商户端）</description>
 
     <dependencies>
         <!-- lombok -->
@@ -104,6 +104,30 @@
             <artifactId>capability-wechat</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- 翻译模块 -->
+        <dependency>
+            <groupId>cn.daxpay.open</groupId>
+            <artifactId>common-translate</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- 基础API服务 -->
+        <dependency>
+            <groupId>cn.daxpay.open</groupId>
+            <artifactId>service-baseapi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- 站内通知服务(公告 + 个人消息) -->
+        <dependency>
+            <groupId>cn.daxpay.open</groupId>
+            <artifactId>service-notify</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- Artemis 消息队列通用模块（供 demo 演示注入 ArtemisTemplateService） -->
+        <dependency>
+            <groupId>cn.daxpay.open</groupId>
+            <artifactId>common-artemis</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/channel/info/ChannelMerchantAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopSignController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/develop/DevelopTradeController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/capability/PayCapabilityController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/channel/PayChannelController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductConfigController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/product/PayProductController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/masterdata/provider/PayProviderController.java
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-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/appinfo/MchAppInfoAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/channel/MerchantChannelMerchantAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/config/MerchantCredentialAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/info/MerchantAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/route/PayRouteAdminController.java
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-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/controller/merchant/store/MchStoreInfoAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/controller/DevicePrinterAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/printer/service/DevicePrinterAdminService.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/controller/DeviceSpeakerAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/speaker/service/DeviceSpeakerAdminService.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/controller/DeviceVendorConfigAdminController.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/device/vendor/service/DeviceVendorConfigAdminService.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopParam.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopSignParam.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/param/develop/DevelopVerifyParam.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopPayResult.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/result/develop/DevelopSignResult.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopSignService.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/develop/DevelopTradeService.java
diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-admin/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/admin/service/merchant/info/MerchantAdminService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/auth/MchPasswordLoginHandler.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/DaxPayProperties.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/config/MerchantAuthConfiguration.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/ChannelConfigController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/config/MerchantCredentialController.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchAppInfoController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MchUserAdminController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/info/MerchantUserController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchBasicController.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderController.java
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-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/miniapp/MiniMchOrderQueryController.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/controller/store/MchStoreInfoController.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/appinfo/MchAppInfoConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/ChannelConfigConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/config/MerchantCredentialConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantInfoConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/info/MerchantUserConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/basic/PayRouteBasicConfigConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/scene/PayRouteSceneConfigConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/route/strategy/PayRouteStrategyConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/convert/store/MchStoreInfoConvert.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/appinfo/MchAppInfoMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/ChannelConfigMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/config/MerchantCredentialMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantInfoMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/info/MerchantUserMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/basic/PayRouteBasicConfigMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/scene/PayRouteSceneConfigMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/route/strategy/PayRouteStrategyMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoManager.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/dao/store/MchStoreInfoMapper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/appinfo/MchAppInfo.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/config/MerchantCredential.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantInfo.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/info/MerchantUser.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/basic/PayRouteBasicConfig.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/scene/PayRouteSceneConfig.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/route/strategy/PayRouteStrategy.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/entity/store/MchStoreInfo.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/filter/MchContextLocalFilter.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/appinfo/MchAppInfoQuery.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/MerchantCredentialParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/config/NotifySubscribeParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantForgotParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantInfoQuery.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantRegisterParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserBatchParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserQuery.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdBatchParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/info/MerchantUserResetPwdParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/order/MiniPayOrderQuery.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyBarPayParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/miniapp/quickly/QuicklyQrPayParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigBatchParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/basic/PayRouteBasicConfigItem.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchItem.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneCapabilityBatchParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigBatchParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/scene/PayRouteSceneConfigItem.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/route/strategy/PayRouteStrategyParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoParam.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/param/store/MchStoreInfoQuery.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/appinfo/MchAppInfoResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/ChannelConfigResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/config/MerchantCredentialResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MchResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantInfoResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserDetailResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/info/MerchantUserResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/basic/PayRouteBasicConfigResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/scene/PayRouteSceneConfigResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/route/strategy/PayRouteStrategyResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/result/store/MchStoreInfoResult.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/appinfo/MchAppInfoService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/ChannelConfigService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/config/MerchantCredentialService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/info/MerchantInfoService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchBasicService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/miniapp/MiniMchOrderQueryService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/permission/MerchantPermissionServiceImpl.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantQueryFacadeService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryFacadeService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/query/MerchantUserQueryService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicMatcher.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/facade/PayRouteConfigService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/PayRouteBundle.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/model/RouteHit.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteProductResolver.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteMethodValidator.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneMatcher.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteConfigProviders.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteI18nHelper.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/support/PayRouteStrategyCapabilitySupport.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/store/MchStoreInfoService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserAdminService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java
similarity index 100%
rename from daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/user/MerchantUserService.java
diff --git a/daxpay-payment/daxpay-payment-merchant/pom.xml b/daxpay-payment/daxpay-payment-merchant/pom.xml
deleted file mode 100644
index 01dc01206..000000000
--- a/daxpay-payment/daxpay-payment-merchant/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.daxpay.open</groupId>
-        <artifactId>daxpay-payment</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>daxpay-payment-merchant</artifactId>
-    <packaging>jar</packaging>
-    <description>多商户支付商户端功能实现</description>
-
-    <dependencies>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- 类型转换处理器 -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <scope>provided</scope>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <!-- 类型转换 -->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <!-- web框架 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- 支付公共底座 -->
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>daxpay-payment-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- 打包Excel等资源文件损坏问题 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>docx</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>doc</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.sql</include>
-                    <include>**/*.flt</include>
-                    <include>**/*.xlsx</include>
-                    <include>**/*.xls</include>
-                    <include>**/*.docx</include>
-                    <include>**/*.doc</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-</project>
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java
deleted file mode 100644
index f13401d30..000000000
--- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/DaxpayPaymentMerchantApp.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.daxpay.open.payment.merchant;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.context.annotation.ComponentScan;
-
-/// # 支付商户端装配入口
-///
-@AutoConfiguration
-@ConfigurationPropertiesScan
-@MapperScan(annotationClass = Mapper.class)
-@ComponentScan
-public class DaxpayPaymentMerchantApp {
-}
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 4f6639bcb..000000000
--- a/daxpay-payment/daxpay-payment-merchant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.daxpay.open.payment.merchant.DaxpayPaymentMerchantApp
diff --git a/daxpay-payment/pom.xml b/daxpay-payment/pom.xml
index 5b3dc32fa..c49434551 100644
--- a/daxpay-payment/pom.xml
+++ b/daxpay-payment/pom.xml
@@ -12,12 +12,10 @@
 
     <artifactId>daxpay-payment</artifactId>
     <packaging>pom</packaging>
-    <description>多商户支付核心功能实现</description>
+    <description>多商户支付功能实现（核心底座 + 运营端 + 商户端，单模块）</description>
 
     <modules>
         <module>daxpay-payment-common</module>
-        <module>daxpay-payment-merchant</module>
-        <module>daxpay-payment-admin</module>
     </modules>
 
 </project>
diff --git a/daxpay-start/pom.xml b/daxpay-start/pom.xml
index b462cadd1..63a36cb21 100644
--- a/daxpay-start/pom.xml
+++ b/daxpay-start/pom.xml
@@ -37,22 +37,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- 支付服务和通用控制器 -->
+        <!-- 支付服务和通用控制器（核心底座 + 运营端 + 商户端单模块） -->
         <dependency>
             <groupId>cn.daxpay.open</groupId>
             <artifactId>daxpay-payment-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>daxpay-payment-merchant</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.daxpay.open</groupId>
-            <artifactId>daxpay-payment-admin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- 功能演示模块（需隔离时注释此依赖即可从产物中剔除） -->
         <dependency>