From 9285d06cb9d7d361e6663df5d11b7ce4e05f95dc Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 8 Jul 2024 09:37:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=AA=E4=BA=BA=E6=A1=A9=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonalChargingRecordServiceImpl.java    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PersonalChargingRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PersonalChargingRecordServiceImpl.java
index 7e8285371..757b753b9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PersonalChargingRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PersonalChargingRecordServiceImpl.java
@@ -3,6 +3,9 @@ package com.jsowell.pile.service.impl;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.pile.domain.PileBasicInfo;
+import com.jsowell.pile.service.PileBasicInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -16,6 +19,9 @@ public class PersonalChargingRecordServiceImpl implements PersonalChargingRecord
     @Resource
     private PersonalChargingRecordMapper personalChargingRecordMapper;
 
+    @Autowired
+    private PileBasicInfoService pileBasicInfoService;
+
     @Override
     public int deleteByPrimaryKey(Integer id) {
         return personalChargingRecordMapper.deleteByPrimaryKey(id);
@@ -90,17 +96,19 @@ public class PersonalChargingRecordServiceImpl implements PersonalChargingRecord
             chargingRecord = new PersonalChargingRecord();
         }
 
+        PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(data.getPileSn());
+
         // 处理数据
         chargingRecord.setTransactionCode(transactionCode);
         chargingRecord.setStatus("6");
         chargingRecord.setMemberId("");
-        chargingRecord.setStationId("");
-        chargingRecord.setMerchantId("");
-        chargingRecord.setPileSn("");
-        chargingRecord.setConnectorCode("");
-        chargingRecord.setPileConnectorCode("");
-        chargingRecord.setLogicCard("");
-        chargingRecord.setVinCode("");
+        chargingRecord.setStationId(pileBasicInfo.getStationId() + "");
+        chargingRecord.setMerchantId(pileBasicInfo.getMerchantId() + "");
+        chargingRecord.setPileSn(data.getPileSn());
+        chargingRecord.setConnectorCode(data.getConnectorCode());
+        chargingRecord.setPileConnectorCode(chargingRecord.getPileSn() + chargingRecord.getConnectorCode());
+        chargingRecord.setLogicCard(data.getLogicCard());
+        chargingRecord.setVinCode(data.getVinCode());
         chargingRecord.setStartMode("");
         chargingRecord.setPlateNumber("");
         chargingRecord.setChargeStartTime(DateUtils.parseDate(data.getStartTime()));