查询额外订单收入

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

@@ -227,6 +227,18 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         return resultList;
     }
 
+    /**
+     * 根据merchantId, 查询从他人分账的金额
+     * extra income
+     */
+    public BigDecimal queryExtraIncome(String merchantId) {
+        AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
+        List<OrderSplitRecord> orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, null, null, null);
+        BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总
+        Map<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap();// 当天其他人分账的记录
+        return null;
+    }
+
 }
 
 

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

@@ -0,0 +1,56 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 额外收入明细
+ */
+@Data
+public class ExtraIncomeDetailVO {
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 订单所属运营商
+     */
+    private String merchantId;
+
+    /**
+     * 订单所属站点
+     */
+    private String stationId;
+
+    /**
+     * 订单结算时间
+     */
+    private String settlementTime;
+
+    /**
+     * 订单结算金额
+     */
+    private String settlementAmount;
+
+    /**
+     * 订单电费
+     */
+    private String electricityAmount;
+
+    /**
+     * 订单服务费
+     */
+    private String serviceAmount;
+
+    /**
+     * 电费分账金额
+     */
+    private BigDecimal elecSplitAmount;
+
+    /**
+     * 服务费分账金额
+     */
+    private BigDecimal serviceSplitAmount;
+}

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

@@ -0,0 +1,32 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 额外订单收入VO
+ */
+@Data
+public class ExtraOrderIncomeVO {
+    /**
+     * 开始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+    /**
+     * 收入金额 汇总
+     */
+    private BigDecimal incomeAmount;
+
+    /**
+     * 收入明细
+     */
+    private List<ExtraIncomeDetailVO> list;
+}