From 696fb59e8e88162e5c21ceeb7794853216d413db Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 01:01:55 +0800
Subject: [PATCH] 加入物品流程功能

---
 java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
index aaa3246..814e70a 100644
--- a/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/common/INotifyChargeV1InnerServiceSMO.java
@@ -18,6 +18,7 @@
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
 import com.java110.dto.meterWater.NotifyMeterWaterOrderDto;
+import com.java110.vo.ResultVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,7 +45,7 @@
      * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
      */
     @RequestMapping(value = "/finishCharge", method = RequestMethod.POST)
-    ResponseEntity<String> finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
+    ResultVo finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
 
     /**
      * 璁惧蹇冭烦
@@ -55,12 +56,5 @@
     @RequestMapping(value = "/heartbeat", method = RequestMethod.POST)
     ResponseEntity<String> heartbeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
 
-    /**
-     * 鍏呯數蹇冭烦
-     *
-     * @param notifyChargeOrderDto 鏁版嵁瀵硅薄鍒嗕韩
-     * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
-     */
-    @RequestMapping(value = "/chargeHeartBeat", method = RequestMethod.POST)
-    ResponseEntity<String> chargeHeartBeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto);
+
 }

--
Gitblit v1.8.0