From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java | 67 ++++++---------------------------
1 files changed, 12 insertions(+), 55 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java b/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java
index d983d68..e39de81 100644
--- a/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java
+++ b/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java
@@ -6,6 +6,7 @@
import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
import com.java110.intf.common.INotifyChargeV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -18,17 +19,17 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
+/**
+ * 閫氱敤鍏呯數妗� 鍏呯數瀹屾垚鍥炶皟
+ *
+ * 涓昏鐢ㄤ簬娴嬭瘯 浣跨敤
+ */
@RestController
@RequestMapping(path = "/app/charge")
public class NotifyCommonChargeController extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(NotifyCommonChargeController.class);
- public static final String DING_DING_DOMAIN = "DING_DING_CHARGE";
-
-
- public static final String DING_DING_APP_ID = "APP_ID";
- public static final String DING_DING_APP_SECURE = "APP_SECURE";
@Autowired
private INotifyChargeV1InnerServiceSMO notifyChargeV1InnerServiceSMOImpl;
@@ -38,64 +39,20 @@
* @param request
* @throws Exception
*/
- @RequestMapping(path = "/{id}/{port}/finish", method = RequestMethod.POST)
+ @RequestMapping(path = "/finish", method = RequestMethod.POST)
public ResponseEntity<String> finishCharge(
- @PathVariable String id,
- @PathVariable String port,
@RequestBody String postInfo,
HttpServletRequest request) {
JSONObject param = JSONObject.parseObject(postInfo);
NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
- notifyChargeOrderDto.setOrderId(param.getString("chargeId"));
- notifyChargeOrderDto.setMachineCode(id);
- notifyChargeOrderDto.setPortCode(port);
+ notifyChargeOrderDto.setMachineCode(param.getString("machineCode"));
+ notifyChargeOrderDto.setPortCode(param.getString("portCode"));
notifyChargeOrderDto.setBodyParam(postInfo);
+ notifyChargeOrderDto.setReason(param.getString("reason"));
- return notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
-
+ ResultVo resultVo = notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
+ return ResultVo.createResponseEntity(resultVo);
}
-
- /**
- * <p>鏀粯鍥炶皟Api</p>
- *
- * @param request
- * @throws Exception
- */
- @RequestMapping(path = "/{id}/event", method = RequestMethod.POST)
- public ResponseEntity<String> heartbeat(
- @PathVariable String id,
- @RequestBody String postInfo,
- HttpServletRequest request) {
- NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
- notifyChargeOrderDto.setMachineCode(id);
- notifyChargeOrderDto.setBodyParam(postInfo);
-
- return notifyChargeV1InnerServiceSMOImpl.heartbeat(notifyChargeOrderDto);
-
- }
-
- /**
- * <p>鏀粯鍥炶皟Api</p>
- *
- * @param request
- * @throws Exception
- */
- @RequestMapping(path = "/{id}/{port}/event", method = RequestMethod.POST)
- public ResponseEntity<String> chargeHeartbeat(
- @PathVariable String id,
- @PathVariable String port,
- @RequestBody String postInfo,
- HttpServletRequest request) {
-
- NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
- notifyChargeOrderDto.setMachineCode(id);
- notifyChargeOrderDto.setPortCode(port);
- notifyChargeOrderDto.setBodyParam(postInfo);
-
- return notifyChargeV1InnerServiceSMOImpl.chargeHeartBeat(notifyChargeOrderDto);
-
- }
-
}
--
Gitblit v1.8.0