From 5936e9469a8478459afe7ad57645418fe2a1595a Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Mon, 16 Aug 2021 11:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A9=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/common/api/PileOrderService.java   |  8 ++++----
 .../common/api/factory/PileOrderFallbackFactory.java |  4 ++--
 .../order/controller/HxpcPileOrderController.java    | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java
index e1e97afd..3c77b24b 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PileOrderService.java
@@ -22,8 +22,8 @@ public interface PileOrderService {
      * @param remark   备注
      * @return
      */
-    @GetMapping("/chargeOrder/stopUp")
-    R pileStartUp(@RequestParam("orderNo") String orderNo, @RequestParam("status") Integer status, @RequestParam("remark") String remark);
+    @GetMapping("/chargeOrder/pileStartup")
+    R pileStartup(@RequestParam("orderNo") String orderNo, @RequestParam("status") Integer status, @RequestParam("remark") String remark);
 
     /**
      * 桩停止回调接口
@@ -32,7 +32,7 @@ public interface PileOrderService {
      * @param remark      备注
      * @return
      */
-    @GetMapping("/chargeOrder/pileStopUp")
-    R pileStopUp(@RequestParam("orderNo") String orderNo,@RequestParam("status") Integer status,@RequestParam("remark") String remark);
+    @GetMapping("/chargeOrder/pileStopup")
+    R pileStopup(@RequestParam("orderNo") String orderNo,@RequestParam("status") Integer status,@RequestParam("remark") String remark);
 
 }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
index aed2426c..799e8a4e 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
@@ -22,13 +22,13 @@ public class PileOrderFallbackFactory implements FallbackFactory<PileOrderServic
         logger.error("订单服务调用失败：{}//fallback",cause.getMessage());
         return new PileOrderService() {
             @Override
-            public R pileStartUp(String orderNo, Integer status, String remark) {
+            public R pileStartup(String orderNo, Integer status, String remark) {
 
                 return R.fail("桩启动回调接口失败:" + cause.getMessage());
             }
 
             @Override
-            public R pileStopUp(String orderNo, Integer status, String remark) {
+            public R pileStopup(String orderNo, Integer status, String remark) {
 
                 return R.fail("桩停止回调接口失败:" + cause.getMessage());
             }
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcPileOrderController.java
index 82d0b01a..5defb5ed 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcPileOrderController.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcPileOrderController.java
@@ -44,9 +44,9 @@ public class HxpcPileOrderController extends BaseController {
     /**
      * 测试
      */
-    @GetMapping("/test/chargeOrder/pileStartUp")
+    @GetMapping("/test/chargeOrder/pileStartup")
     private R test(@RequestParam String orderNo, @RequestParam Integer status, @RequestParam String remark){
-        R r = pileOrderService.pileStopUp(orderNo, status, remark);
+        R r = pileOrderService.pileStopup(orderNo, status, remark);
         return r;
     }
 
@@ -58,8 +58,8 @@ public class HxpcPileOrderController extends BaseController {
      * @param remark      备注
      * @return
      */
-    @GetMapping("/chargeOrder/pileStartUp")
-    public R pileStartUp(String orderNo, Integer status, String remark){
+    @GetMapping("/chargeOrder/pileStartup")
+    public R pileStartup(String orderNo, Integer status, String remark){
         //解析订单编号
         String s = orderNo.split("\\.")[0];
         String s1 = s.split(":")[1];
@@ -89,8 +89,8 @@ public class HxpcPileOrderController extends BaseController {
      * @param remark      备注
      * @return
      */
-    @GetMapping("/chargeOrder/pileStopUp")
-    public R pileStopUp(String orderNo,Integer status,String remark){
+    @GetMapping("/chargeOrder/pileStopup")
+    public R pileStopup(String orderNo,Integer status,String remark){
         //解析订单编号
         String s = orderNo.split("\\.")[0];
         String s1 = s.split(":")[1];