From 3448cbfcc92d501a639d63e5098ef88356cfcdec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 26 一月 2026 11:21:41 +0800
Subject: [PATCH] 途来电对接订单信息

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/NotifyController.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/NotifyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/NotifyController.java
index 224bd63..7d0a7a6 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/NotifyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/NotifyController.java
@@ -2,6 +2,13 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
+import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.service.ISiteService;
+import com.ruoyi.chargingPile.service.TChargingGunService;
+import com.ruoyi.chargingPile.service.TChargingPileService;
 import com.ruoyi.chargingPile.tulaidian.domain.ChargeRecord;
 import com.ruoyi.chargingPile.tulaidian.domain.ChargeStatus;
 import com.ruoyi.chargingPile.tulaidian.domain.TContent;
@@ -17,8 +24,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,6 +44,12 @@
     private ChargingOrderClient chargingOrderClient;
     @Autowired
     private IContentService contentService;
+    @Autowired
+    private TChargingGunService chargingGunService;
+    @Autowired
+    private TChargingPileService chargingPileService;
+    @Autowired
+    private ISiteService siteService;
     private static final String OperatorID = "MA01H3BQ3";
     private static final String OperatorSecret = "f1331ef0b37c2d2";
     private static final String SigSecret = "a6fedf0e1b27d6f8";
@@ -67,6 +82,7 @@
         chargingOrder.setCode(chargeRecord.getStartChargeSeq());
         chargingOrder.setOrderSource(2);
         // TODO 运营商id
+        chargingOrder.setOperatorId(1);
         chargingOrder.setTripartitePlatformName("途来电");
         chargingOrder.setStartChargeSeq(chargeRecord.getStartChargeSeq());
         chargingOrder.setSourceName("途来电");
@@ -78,6 +94,21 @@
         chargingOrder.setServiceCharge(chargeRecord.getTotalSeviceMoney());
         chargingOrder.setTotalElectricity(chargeRecord.getTotalPower());
         chargingOrder.setPaymentAmount(chargeRecord.getTotalMoney());
+        chargingOrder.setRechargePaymentType(1);
+        chargingOrder.setRechargePaymentStatus(2);
+        chargingOrder.setChargeAmount(chargeRecord.getTotalMoney());
+        chargingOrder.setOrderAmount(chargeRecord.getTotalMoney());
+        chargingOrder.setResidualAmount(BigDecimal.ZERO);
+        chargingOrder.setPaymentAmount(chargeRecord.getTotalMoney());
+        chargingOrder.setPayTime(LocalDateTime.now());
+        // 通过枪编号查询枪
+        TChargingGun chargingGun = chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
+                .eq(TChargingGun::getCode, chargeRecord.getConnectorID()));
+        if(Objects.nonNull(chargingGun)){
+            chargingOrder.setChargingGunId(chargingGun.getId());
+            chargingOrder.setChargingPileId(chargingGun.getChargingPileId());
+            chargingOrder.setSiteId(chargingGun.getSiteId());
+        }
         R<Long> orderIdR = chargingOrderClient.addChargingOrder(chargingOrder);
         if(orderIdR.getCode() == 200){
             // TODO 充电明细

--
Gitblit v1.7.1