Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -361,6 +361,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			stationVO.setFastFree(fastFree);
 			stationVO.setSlowTotal(slowTotal);
 			stationVO.setSlowFree(slowFree);
+			stationVO.setTotalFree(fastFree + slowFree);
 
 			// 查询当前时段电费
 			CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationVO.getStationId());

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java

@@ -75,6 +75,11 @@ public class StationInfoVO {
 	 */
 	private int slowFree;
 
+	/**
+	 * 总空闲枪口数
+	 */
+	private int totalFree;
+
 	/**
 	 * 经度
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java

@@ -10,6 +10,12 @@ import lombok.Data;
  */
 @Data
 public class AccumulativeInfoVO {
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
     /**
      * 枪口编号
      */

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -925,10 +925,11 @@
 
     <select id="getAccumulativeInfoForLianLian" resultType="com.jsowell.pile.vo.lianlian.AccumulativeInfoVO">
         SELECT
+            t1.order_code as orderCode,
             t1.pile_connector_code as pileConnectorCode,
             t1.pile_sn as pileSn,
             t1.station_id as stationId,
-            t2.total_used_electricity as connectorElectricity
+            IFNULL(t2.total_used_electricity,0.00) as connectorElectricity
         FROM
             order_basic_info t1
                 JOIN order_detail t2 ON t1.order_code = t2.order_code