订单导出结算时间倒叙、异常订单结算优化

xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml

@@ -566,6 +566,7 @@
             and find_in_set(tenant_id, #{tenantIdsStr})
         </if>
         order by create_time desc
+        LIMIT 50
     </select>
 
 </mapper>

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java

@@ -73,6 +73,10 @@ public interface XhpcRealTimeOrderMapper {
      */
     Map<String,Object> getMessage(@Param("realTimeOrderId")Long realTimeOrderId);
 
+    /**
+     * 获取场站信息
+     */
+    Map<String,Object> getXhpcChargingStationById(Long chargingStationId);
     /**
      * 异常订单详情接口(PC端)
      * @param chargeOrderId

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java

@@ -182,7 +182,10 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
             }
             //获取开始充电时间、结束时间、计费模型、充电度数、已充金额
             XhpcChargeOrder chargeOrder = xhpcChargeOrderService.getChargingOrderId(Long.parseLong(message.get("chargeOrderId").toString()));
-
+            if(chargeOrder.getRateModelId()==null || "".equals(chargeOrder.getRateModelId())){
+                Map<String, Object> xhpcChargingStationMap = xhpcRealTimeOrderMapper.getXhpcChargingStationById(chargeOrder.getChargingStationId());
+                chargeOrder.setRateModelId(Long.valueOf(xhpcChargingStationMap.get("rateModelId").toString()));
+            }
             //获取该订单最后一条实时数据
             Map<String, Object> cacheMap = redisService.getCacheMap("order:" + chargeOrder.getSerialNumber());
             List<CacheRealtimeData> list = (List<CacheRealtimeData>) cacheMap.get("realtimeDataList");
@@ -334,6 +337,10 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
             xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
             return AjaxResult.success();
         }
+        if(xhpcChargeOrder.getRateModelId()==null || "".equals(xhpcChargeOrder.getRateModelId())){
+            Map<String, Object> xhpcChargingStationMap = xhpcRealTimeOrderMapper.getXhpcChargingStationById(xhpcChargeOrder.getChargingStationId());
+            xhpcChargeOrder.setRateModelId(Long.valueOf(xhpcChargingStationMap.get("rateModelId").toString()));
+        }
         //总金额
         BigDecimal money = powerPrice.add(servicePrice);
         //总服务费 servicePrice

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java

@@ -1291,6 +1291,7 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
         int freeTime =0;//空闲
         int charge =0;//充电
         int unknown =0;//未知
+        int insertGun =0;//已插枪
         if(terminal !=null && terminal.size()>0){
             for (String st:terminal) {
                 Map<String, Object> cacheMap = redisService.getCacheMap("gun:" + st);
@@ -1303,7 +1304,11 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
                         fault++;
                     }else if(cacheMap.containsKey("status") &&
                             "空闲".equals(cacheMap.get("status").toString())){
-                        freeTime++;
+                        if("是".equals(cacheMap.get("vehicleGunStatus").toString())){
+                            insertGun++;
+                        }else{
+                            freeTime++;
+                        }
                     }else{
                         charge++;
                     }
@@ -1347,6 +1352,12 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
         mapList4.add(objectMap4);
         mapList.addAll(mapList4);
 
+        List<Map<String,Object>> mapList5 =new ArrayList<>();
+        Map<String,Object> objectMap5 =new HashMap<>();
+        objectMap5.put("name","已插枪");
+        objectMap5.put("value",insertGun);
+        mapList5.add(objectMap5);
+        mapList.addAll(mapList5);
         return mapList;
 
     }

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -1162,7 +1162,7 @@
         <if test="isNotNull==1">
             and ho.total_price &gt;=0
         </if>
-        order by ho.create_time desc
+        order by ho.end_time desc
     </select>
 
     <select id="getReatTimeList" resultType="map">

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml

@@ -547,6 +547,13 @@
         where ro.real_time_order_id=#{realTimeOrderId}
     </select>
 
+    <select id="getXhpcChargingStationById" resultType="map">
+        select
+            charging_station_id chargingStationId,
+            rate_model_id as rateModelId
+        from xhpc_charging_station where charging_station_id=#{chargingStationId}
+    </select>
+
     <select id="getMessageChargeOrderId" resultType="map">
         select
             co.charge_order_id as chargeOrderId,