Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
#	jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigOrderVO.java

@@ -0,0 +1,56 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SplitConfigOrderVO {
+
+    /**
+     * 站点ID
+     */
+    private String stationId;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 时间范围
+     */
+    private String timeRange;
+
+    /**
+     * 订单数量
+     */
+    private int orderCount;
+
+    /**
+     * 总电费分账金额
+     */
+    private BigDecimal totalElectricitySplitAmount;
+
+    /**
+     * 总服务费分账金额
+     */
+    private BigDecimal totalServiceSplitAmount;
+
+    /**
+     * 总手续费分账金额
+     */
+    private BigDecimal totalFeeAmount;
+
+    /**
+     * 总收入分账金额= 总电费分账金额 +总手续费分账金额 -总手续费分账金额
+     */
+    private BigDecimal totalRevenueAmount;
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigStationVO.java

@@ -2,6 +2,8 @@ package com.jsowell.pile.vo.web;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class SplitConfigStationVO {
 
@@ -15,4 +17,12 @@ public class SplitConfigStationVO {
      */
     private String stationName;
 
+    private String tradeDate;
+
+    private BigDecimal electricityAmount;
+
+    private BigDecimal serviceAmount;
+
+    private BigDecimal feeAmount;
+
 }