From 28783dbc65df72d5687cb28345e8a76380159727 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 20 May 2023 13:55:00 +0800
Subject: [PATCH] =?UTF-8?q?add=20=20=E8=81=94=E8=81=94=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=81=9C=E6=AD=A2=E5=85=85=E7=94=B5=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/SpringBootTestController.java   |  4 +-
 .../thirdparty/service/LianLianService.java   |  7 +++
 .../service/impl/LianLianServiceImpl.java     | 51 +++++++++++++++++--
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 01a181721..01f86d3c0 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -189,9 +189,9 @@ public class SpringBootTestController {
 		// lianLianService.pushStartChargeResult("C27680791529");
 
 		// 推送充电状态
-		lianLianService.pushChargeStatus("C27680791529");
-
+		// lianLianService.pushChargeStatus("C27680791529");
 
+		lianLianService.pushStopChargeResult("C27680791529");
 
 	}
 
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java
index 8162d3166..6a6de0834 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java
@@ -107,4 +107,11 @@ public interface LianLianService {
 	 * @return
 	 */
 	String pushChargeStatus(String orderCode);
+
+	/**
+	 * 推送停止充电结果(仅在 交易记录的帧类型中调用)
+	 * @param orderCode
+	 * @return
+	 */
+	String pushStopChargeResult(String orderCode);
 }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java
index 3922f77ea..ffeb1b8b6 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java
@@ -565,8 +565,6 @@ public class LianLianServiceImpl implements LianLianService {
 			vo.setStartChargeSeqStat(3); // 3-停止中
 		}
 		return vo;
-
-		// TODO 推送停止充电结果
 	}
 
 	/**
@@ -832,6 +830,53 @@ public class LianLianServiceImpl implements LianLianService {
 		return result;
 	}
 
+	/**
+	 * 推送停止充电结果(仅在 交易记录的帧类型中调用)
+	 * @param orderCode
+	 * @return
+	 */
+	@Override
+	public String pushStopChargeResult(String orderCode) {
+		String url  = TEST_URL + "notification_stop_charge_result";
+		// 根据订单号查询订单信息
+		OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+		if (orderInfo == null) {
+			return null;
+		}
+		String orderStatus = orderInfo.getOrderStatus();
+		String successFlag = "1";
+		if (StringUtils.equals(orderStatus, OrderStatusEnum.IN_THE_CHARGING.getValue())) {
+			// 充电中
+			orderStatus = "2";
+		}else if (StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) {
+			// 订单完成
+			orderStatus = "4";
+			successFlag = "0";
+		}else {
+			orderStatus = "5";
+		}
+		// 获取token
+		String token = getToken(OPERATOR_ID, OPERATOR_SECRET);
+		if (StringUtils.isBlank(token)) {
+			return null;
+		}
+
+		// 拼装联联平台参数
+		JSONObject json = new JSONObject();
+		json.put("StartChargeSeq", orderCode);
+		json.put("StartChargeSeqStat", Integer.valueOf(orderStatus));
+		json.put("ConnectorID", orderInfo.getPileConnectorCode());
+		json.put("SuccStat", successFlag);
+		json.put("FailReason", 0);
+
+		String jsonString = JSONObject.toJSONString(json);
+
+		// 发送请求
+		String result = HttpRequestUtil.sendPost(token, jsonString, url, DATA_SECRET, DATA_SECRETIV, OPERATOR_ID, SIG_SECRET);
+
+		return result;
+	}
+
 	// private ChargeDetail setChargeDetail(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail) {
 	// 	ChargeDetail detail = new ChargeDetail();
 	//
@@ -844,8 +889,6 @@ public class LianLianServiceImpl implements LianLianService {
 	// 	detail.setDetailSeviceMoney();
 	// }
 
-	// TODO 推送停止充电结果  notification_stop_charge_result
-
 	// TODO 推送充电订单信息  notification_charge_order_info
 
 	// TODO 推送订单对账结果信息  check_charge_orders