对账单导出字段调整

src/main/java/com/sqx/modules/reconciliation/model/ShopBillVo.java

@@ -17,21 +17,21 @@ public class ShopBillVo extends PlatformBill{
      */
     public static List<String> getExcelHead() {
         return Arrays.asList(
-                "日期 ",
                 "店铺名称",
-                "店铺手机",
+                "店铺手机号",
+                "日期",
                 "期初金额（元）",
                 "收入（元）",
                 "收入笔数",
-                "商家提现（元）",
-                "商家提现手续费",
-                "商家提现笔数",
-                "骑手提现",
-                "骑手提现手续费",
-                "骑手提现笔数",
-                "退款金额（元）",
-                "退款笔数",
+                "平台抽成手续费",
+                "提现金额（元）",
+                "提现手续费",
+                "提现笔数",
                 "期末金额（元）",
-                "平台抽成手续费");
+                "账户余额",
+                "总收益（元）",
+                "用户实际付款（元）",
+                "退款金额（元）",
+                "退款笔数");
     }
 }

src/main/java/com/sqx/modules/reconciliation/service/impl/PlatformBillServiceImpl.java

@@ -205,7 +205,7 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
                 "提现手续费",
                 "提现笔数",
                 "期末金额（元）",
-                "期末金额（元）",
+                "赠送骑手余额（元）",
                 "总收益（元）");
         data.setTitles(titleList);
         List<List<Object>> rows = new ArrayList<>();
@@ -240,22 +240,23 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
 
         List<List<Object>> rows = shopBillVoList.stream().map(shopBillVo -> {
             List<Object> row = new ArrayList<>();
-            row.add(shopBillVo.getDayId());
             row.add(shopBillVo.getShopName());
             row.add(shopBillVo.getPhone());
+            row.add(shopBillVo.getDayId());
             row.add(shopBillVo.getStartMoney());
             row.add(shopBillVo.getRevenue());
             row.add(shopBillVo.getRevenueCount());
+            row.add(shopBillVo.getPlatformRates());
             row.add(shopBillVo.getShopPayouts());
             row.add(shopBillVo.getShopPayoutsRates());
             row.add(shopBillVo.getShopPayoutsCount());
-            row.add(shopBillVo.getRiderPayouts());
-            row.add(shopBillVo.getRiderPayoutsRates());
-            row.add(shopBillVo.getRiderPayoutsCount());
+            row.add(shopBillVo.getEndMoney());
+            row.add(shopBillVo.getShopBalance());
+            row.add(shopBillVo.getTotalIncome());
+            row.add(shopBillVo.getPayMoney());
             row.add(shopBillVo.getRefundMoney());
             row.add(shopBillVo.getRefundCount());
-            row.add(shopBillVo.getEndMoney());
-            row.add(shopBillVo.getPlatformRates());
+
             return row;
         }).collect(Collectors.toList());
 
@@ -274,29 +275,27 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
     public ExcelData excelPlatformBillList(PlatformBillDto query) {
         List<PlatformBill> platformBills=baseMapper.excelPlatformBillList(query);
         ExcelData data = new ExcelData();
-        data.setName("骑手排行");
+        data.setName("平台对账");
         List<String> titleList= Arrays.asList(
-                "店铺名",
-                "手机号",
                 "日期 ",
                 "期初金额（元）",
                 "收入（元）",
                 "收入笔数",
                 "平台抽成手续费",
-                "提现金额",
-                "提现手续费",
-                "提现笔数",
-                "期末金额（元）",
-                "账户余额（元）",
-                "总收益（元）",
-                "用户实际付款（元）",
+                "商家提现金额",
+                "商家提现手续费",
+                "商家提现笔数",
+                "骑手提现金额",
+                "骑手提现手续费",
+                "骑手提现笔数",
                 "退款金额（元）",
-                "退款笔数");
+                "退款笔数",
+                "期末金额（元）"
+                );
         data.setTitles(titleList);
         List<List<Object>> rows = new ArrayList<>();
         for (PlatformBill platformBill:platformBills ){
             List<Object> row = new ArrayList<>();
-            row.add(platformBill.getShopName());
             row.add(platformBill.getDayId());
             row.add(platformBill.getStartMoney());
             row.add(platformBill.getRevenue());
@@ -305,12 +304,12 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
             row.add(platformBill.getShopPayouts());
             row.add(platformBill.getShopPayoutsRates());
             row.add(platformBill.getShopPayoutsCount());
-            row.add(platformBill.getEndMoney());
-            row.add(platformBill.getEndMoney());
-            row.add(platformBill.getTotalIncome());
-            row.add(platformBill.getPayMoney());
+            row.add(platformBill.getRiderPayouts());
+            row.add(platformBill.getRiderPayoutsRates());
+            row.add(platformBill.getRiderPayoutsRates());
             row.add(platformBill.getRefundMoney());
             row.add(platformBill.getRefundCount());
+            row.add(platformBill.getEndMoney());
             rows.add(row);
         }
         data.setRows(rows);