From fc08cbbb921e42032c52184a7950925d96b2a13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com>
Date: Thu, 15 Jan 2026 10:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B2=BE=E7=AE=80=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/erp-api/pom.xml                                    | 10 +++++-----
 .../erp}/controller/AfterSaleProcessingController.java |  2 +-
 .../erp}/controller/OfflineGoodsController.java        |  2 +-
 .../erp}/controller/OfflineOrderController.java        |  2 +-
 .../erp}/controller/OfflineRefundController.java       |  2 +-
 .../erp}/controller/OfflineShipController.java         |  2 +-
 .../cn/qihangerp/erp}/controller/OrderController.java  |  4 ++--
 .../qihangerp/erp}/controller/OrderItemController.java |  4 ++--
 .../qihangerp/erp}/controller/OrderShipController.java |  6 +++---
 .../cn/qihangerp/erp}/controller/RefundController.java |  2 +-
 .../qihangerp/erp}/controller/ShipmentController.java  |  2 +-
 .../cn/qihangerp/erp/request}/OrderCancelRequest.java  |  2 +-
 .../erp/request}/OrderItemSpecIdUpdateBo.java          |  2 +-
 .../erp/request}/ShipOrderItemSkuIdUpdateBo.java       |  2 +-
 .../erp/request}/StockOutEntryGenerateBo.java          |  2 +-
 microservices/pom.xml                                  |  2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/AfterSaleProcessingController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OfflineGoodsController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OfflineOrderController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OfflineRefundController.java (95%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OfflineShipController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OrderController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OrderItemController.java (94%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/OrderShipController.java (97%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/RefundController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp}/controller/ShipmentController.java (98%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp/request}/OrderCancelRequest.java (81%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp/request}/OrderItemSpecIdUpdateBo.java (79%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp/request}/ShipOrderItemSkuIdUpdateBo.java (78%)
 rename {microservices/order-api/src/main/java/cn/qihangerp/api/order => api/erp-api/src/main/java/cn/qihangerp/erp/request}/StockOutEntryGenerateBo.java (72%)

diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml
index ae7081ea..0aa5de14 100644
--- a/api/erp-api/pom.xml
+++ b/api/erp-api/pom.xml
@@ -112,11 +112,11 @@
             <artifactId>order</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.services</groupId>
-            <artifactId>order-api</artifactId>
-            <version>1.0.6</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>order-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>mysql</groupId>
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java
index 9364e220..0980968c 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.PageQuery;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java
index 60dd38b2..94d4bdd5 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java
index 0208abda..65c34c14 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java
similarity index 95%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java
index a70d4198..61d1ca6f 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineRefundController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.TableDataInfo;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java
index 96bd4394..0de742c3 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java
index be97832f..d2a7bbf6 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java
@@ -1,6 +1,6 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
-import cn.qihangerp.api.order.OrderCancelRequest;
+import cn.qihangerp.erp.request.OrderCancelRequest;
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.request.OrderSearchRequest;
 import cn.qihangerp.model.bo.OrderAllocateShipRequest;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java
similarity index 94%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java
index 3b1c9b13..05136235 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java
@@ -1,8 +1,8 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 
-import cn.qihangerp.api.order.OrderItemSpecIdUpdateBo;
+import cn.qihangerp.erp.request.OrderItemSpecIdUpdateBo;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.TableDataInfo;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java
similarity index 97%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java
index 436796f3..9b8996dd 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java
@@ -1,7 +1,7 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
-import cn.qihangerp.api.order.ShipOrderItemSkuIdUpdateBo;
-import cn.qihangerp.api.order.StockOutEntryGenerateBo;
+import cn.qihangerp.erp.request.ShipOrderItemSkuIdUpdateBo;
+import cn.qihangerp.erp.request.StockOutEntryGenerateBo;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.ResultVo;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java
index c198754f..896d5d83 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java
similarity index 98%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java
index 9ecd2416..5e401d9c 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order.controller;
+package cn.qihangerp.erp.controller;
 
 
 import cn.qihangerp.common.AjaxResult;
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderCancelRequest.java b/api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderCancelRequest.java
similarity index 81%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderCancelRequest.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderCancelRequest.java
index a96d77bf..8a991792 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderCancelRequest.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderCancelRequest.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order;
+package cn.qihangerp.erp.request;
 
 import lombok.Data;
 
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java b/api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderItemSpecIdUpdateBo.java
similarity index 79%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderItemSpecIdUpdateBo.java
index f7c558bc..57575691 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/request/OrderItemSpecIdUpdateBo.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order;
+package cn.qihangerp.erp.request;
 
 import lombok.Data;
 
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/ShipOrderItemSkuIdUpdateBo.java b/api/erp-api/src/main/java/cn/qihangerp/erp/request/ShipOrderItemSkuIdUpdateBo.java
similarity index 78%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/ShipOrderItemSkuIdUpdateBo.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/request/ShipOrderItemSkuIdUpdateBo.java
index 7606cafd..3d48e5a4 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/ShipOrderItemSkuIdUpdateBo.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/request/ShipOrderItemSkuIdUpdateBo.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order;
+package cn.qihangerp.erp.request;
 
 import lombok.Data;
 
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/StockOutEntryGenerateBo.java b/api/erp-api/src/main/java/cn/qihangerp/erp/request/StockOutEntryGenerateBo.java
similarity index 72%
rename from microservices/order-api/src/main/java/cn/qihangerp/api/order/StockOutEntryGenerateBo.java
rename to api/erp-api/src/main/java/cn/qihangerp/erp/request/StockOutEntryGenerateBo.java
index e9388eb7..7409e64b 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/StockOutEntryGenerateBo.java
+++ b/api/erp-api/src/main/java/cn/qihangerp/erp/request/StockOutEntryGenerateBo.java
@@ -1,4 +1,4 @@
-package cn.qihangerp.api.order;
+package cn.qihangerp.erp.request;
 
 import lombok.Data;
 
diff --git a/microservices/pom.xml b/microservices/pom.xml
index 2078b8f7..bd71986e 100644
--- a/microservices/pom.xml
+++ b/microservices/pom.xml
@@ -17,7 +17,7 @@
     <url>http://maven.apache.org</url>
     <modules>
 <!--        <module>goods-api</module>-->
-        <module>order-api</module>
+<!--        <module>order-api</module>-->
         <module>jd-api</module>
 <!--        <module>dou-api</module>-->
         <module>tao-api</module>