From e284cee23d125a13986eea10ff33ff74fdaf887d Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 8 Aug 2022 17:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=85=E7=94=B5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E8=AE=A2=E5=8D=95=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/api/XhpcPileOrderController.java    |  5 +++++
 .../impl/XhpcRealTimeOrderServiceImpl.java    | 22 +++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
index 83cdf2ec..3be7513b 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
@@ -375,6 +375,11 @@ public class XhpcPileOrderController extends BaseController {
             if(cacheOrderData.getTotalPowerQuantity()==0 || totalPowerQuantity.compareTo(new BigDecimal(0.1))<1 || money.compareTo(new BigDecimal(0.1))<1){
                 xhpcChargeOrder.setStatus(3);
                 xhpcChargeOrder.setUpdateTime(new Date());
+                int startSoc1 = cacheOrderData.getStartSoc();
+                int endSoc1 = cacheOrderData.getEndSoc();
+
+                xhpcChargeOrder.setStartSoc(startSoc1 + "");
+                xhpcChargeOrder.setEndSoc(endSoc1 + "");
                 xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
                 xhpcRealTimeOrderService.addZeroHistoryOrder(xhpcChargeOrder);
                 logger.info("*********************电量为0订单号>>>>>orderNo：" + orderNo);
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
index af21f7de..2f7c3a5b 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
@@ -1313,13 +1313,19 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
         logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>");
         logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>>>>");
         logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>>>>");
-        if(!"40".equals(xhpcHistoryOrder.getStopReasonEvcs())){
-            XhpcWorkHistoryOrderDto xhpcWorkHistoryOrderDto =new XhpcWorkHistoryOrderDto();
-            BeanUtils.copyProperties(xhpcHistoryOrder,xhpcWorkHistoryOrderDto);
-            String nameByCode = StopReasonEnum.getNameByCode(xhpcHistoryOrder.getStopReasonEvcs());
-            xhpcWorkHistoryOrderDto.setStopReasonEvcsName(nameByCode);
-            xhpcHistoryOrderService.insertXhpcWorkHistoryOrderDto(xhpcWorkHistoryOrderDto);
-            logger.info("<<<<<<<<<<<<<<<<入库成功>>>>>>>>>订单号：>>>");
+        try {
+            int startSoc = Integer.parseInt(xhpcHistoryOrder.getStartSoc());
+            int endSoc = Integer.parseInt(xhpcHistoryOrder.getEndSoc());
+            if(!"40".equals(xhpcHistoryOrder.getStopReasonEvcs()) || startSoc>95 || endSoc>95){
+                XhpcWorkHistoryOrderDto xhpcWorkHistoryOrderDto =new XhpcWorkHistoryOrderDto();
+                BeanUtils.copyProperties(xhpcHistoryOrder,xhpcWorkHistoryOrderDto);
+                String nameByCode = StopReasonEnum.getNameByCode(xhpcHistoryOrder.getStopReasonEvcs());
+                xhpcWorkHistoryOrderDto.setStopReasonEvcsName(nameByCode);
+                xhpcHistoryOrderService.insertXhpcWorkHistoryOrderDto(xhpcWorkHistoryOrderDto);
+                logger.info("<<<<<<<<<<<<<<<<入库成功>>>>>>>>>订单号：>>>");
+            }
+        }catch (Exception e){
+
         }
 
     }
@@ -1482,6 +1488,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
         xhpcHistoryOrder.setInternetSerialNumber(xhpcChargeOrder.getInternetSerialNumber());
         xhpcHistoryOrder.setType(2);
         xhpcHistoryOrder.setStatus(0);
+        xhpcHistoryOrder.setStartSoc(xhpcChargeOrder.getStartSoc());
+        xhpcHistoryOrder.setEndSoc(xhpcChargeOrder.getEndSoc());
         Date date = new Date();
         xhpcHistoryOrder.setCreateTime(date);
         Map<String, Object> pushOrder = redisService.getCacheMap("pushOrder:"+xhpcChargeOrder.getSerialNumber());