From f9334d0be4fa58a4f51588050203c17181467542 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 15 Apr 2025 10:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=B5=E6=B1=A0=E5=85=85=E7=94=B5=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=96=B9=E6=B3=95=E8=87=B30x3b=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/uniapp/customer/OrderController.java  | 30 ++++++++++++++++---
 .../TransactionRecordsRequestHandler.java     | 15 ++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
index 195ee8d93..c74894e9f 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
@@ -11,7 +11,9 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.domain.ChargeAlgorithmRecord;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.service.ChargeAlgorithmRecordService;
 import com.jsowell.pile.vo.base.StationInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.OrderVO;
 import com.jsowell.pile.vo.uniapp.customer.UniAppOrderVO;
@@ -19,10 +21,7 @@ import com.jsowell.service.OrderService;
 import com.jsowell.wxpay.dto.WechatSendMsgDTO;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -43,6 +42,9 @@ public class OrderController extends BaseController {
 	@Autowired
 	private WxAppletRemoteService wxAppletRemoteService;
 
+	@Autowired
+	private ChargeAlgorithmRecordService chargeAlgorithmRecordService;
+
 	/**
 	 * 生成订单/创建订单
 	 * http://localhost:8080/uniapp/order/generateOrder
@@ -389,4 +391,24 @@ public class OrderController extends BaseController {
 		}
 		return response;
 	}
+
+	/**
+	 * 查询电池充电报告
+	 * @param request
+	 * @param orderCode
+	 * @return
+	 */
+	@GetMapping("/queryChargeAlgorithmRecord/{orderCode}")
+	public RestApiResponse<?> queryChargeAlgorithmRecord(HttpServletRequest request, @PathVariable("orderCode") String orderCode) {
+		RestApiResponse<?> response = null;
+		try {
+			ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode);
+			response = new RestApiResponse<>(record);
+		} catch (Exception e) {
+			logger.error("查询电池充电报告 error, ", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("查询电池充电报告 params:{}, result:{}", orderCode, response);
+		return response;
+	}
 }
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
index d297a6c09..8277a1b4b 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java
@@ -24,6 +24,7 @@ import com.jsowell.pile.service.*;
 import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
 import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
 import com.jsowell.thirdparty.common.CommonService;
+import com.jsowell.thirdparty.platform.service.impl.ChargeAlgorithmService;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +78,9 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
     @Autowired
     private PileBasicInfoService pileBasicInfoService;
 
+    @Autowired
+    private ChargeAlgorithmService chargeAlgorithmService;
+
     @Autowired
     private PersonalChargingRecordService personalChargingRecordService;
 
@@ -680,6 +684,17 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
                     log.error("推送第三方平台订单信息error, ", e);
                 }
             }, executor);
+
+            // 异步推送充电订单算法平台
+            CompletableFuture.runAsync(() -> {
+                try {
+                    String result = chargeAlgorithmService.pushOrderInfo(finalOrderBasicInfo.getOrderCode());
+                    log.info("异步推送充电订单算法平台 result:{}", result);
+                } catch (Exception e) {
+                    log.error("异步推送充电订单算法平台 error, ", e);
+                }
+            }, executor);
+            
         } else {
             // 平台没有查到订单
             orderBasicInfoService.saveAbnormalOrder(data);