From 58096b74affc0322591d0103c2ee6317e6552e0b Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 3 Sep 2024 09:39:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/PileService.java | 10 +---------
 .../pile/service/impl/OrderBasicInfoServiceImpl.java   |  9 +++------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index 9dc19cb57..bbe4dc2ef 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -12,24 +12,17 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.*;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
-import com.jsowell.pile.service.PileSnGenerateService;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.transaction.dto.PileTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
-import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
-import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO;
-import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO;
-import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO;
-import com.jsowell.pile.vo.uniapp.customer.AppletPileDetailVO;
+import com.jsowell.pile.vo.uniapp.customer.*;
 import com.jsowell.pile.vo.web.PileDetailVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,7 +35,6 @@ import java.util.stream.Collectors;
 
 @Service
 public class PileService {
-	private final Logger log = LoggerFactory.getLogger(this.getClass());
 
 	@Autowired
 	private TransactionService pileTransactionService;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index dcd3a497d..9e253a79d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -32,6 +32,7 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.YKCUtils;
 import com.jsowell.common.util.bean.BeanUtils;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.common.util.id.SnowflakeIdWorker;
@@ -2985,12 +2986,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         if (StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) {
             // 从pileConnectorCode解析
             String pileConnectorCode = dto.getPileConnectorCode();
-            if (StringUtils.isNotEmpty(pileConnectorCode) && pileConnectorCode.length() == Constants.PILE_CONNECTOR_CODE_LENGTH) {
-                dto.setPileSn(StringUtils.substring(pileConnectorCode, 0, pileConnectorCode.length() - 2));
-                dto.setConnectorCode(StringUtils.substring(pileConnectorCode, pileConnectorCode.length() - 2, pileConnectorCode.length()));
-            } else {
-                throw new BusinessException(ReturnCodeEnum.CODE_DATA_LENGTH_ERROR);
-            }
+            dto.setPileSn(YKCUtils.getPileSn(pileConnectorCode));
+            dto.setConnectorCode(YKCUtils.getConnectorCode(pileConnectorCode));
         } else {
             // 说明pileSn 和 connectorCode前端传了，那就校验一下长度
             if (dto.getPileSn().length() != Constants.PILE_SN_LENGTH_FOR_EV || dto.getConnectorCode().length() != Constants.CONNECTOR_CODE_LENGTH_FOR_EV