Merge branch 'refs/heads/dev-对账管理' into dev-test

src/main/java/com/sqx/modules/reconciliation/controller/PlatformBillController.java

@@ -48,6 +48,5 @@ public class PlatformBillController {
         PageUtils pageUtils = platformBillService.platformBill(platformBillDto);
         return Result.success().put("data",pageUtils);
     }
-
 }
 

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

@@ -2,10 +2,36 @@ package com.sqx.modules.reconciliation.model;
 
 import lombok.Data;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Data
 public class ShopBillVo extends PlatformBill{
 
     private String phone;
     private String shopId;
 
+    /**
+     * excel导出文件头
+     * @return 文件头
+     */
+    public static List<String> getExcelHead() {
+        return Arrays.asList(
+                "日期 ",
+                "店铺名称",
+                "店铺手机",
+                "期初金额（元）",
+                "收入（元）",
+                "收入笔数",
+                "商家提现（元）",
+                "商家提现手续费",
+                "商家提现笔数",
+                "骑手提现",
+                "骑手提现手续费",
+                "骑手提现笔数",
+                "退款金额（元）",
+                "退款笔数",
+                "期末金额（元）",
+                "平台抽成手续费");
+    }
 }

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

@@ -234,29 +234,13 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
      */
     @Override
     public ExcelData excelShopBillList(PlatformBillDto query) {
-        List<ShopBillVo> shopBillVoList=baseMapper.excelShopBillList(query);
-        ExcelData data = new ExcelData();
-        data.setName("商户对账");
-        List<String> titleList= Arrays.asList(
-                "日期 ",
-                "期初金额（元）",
-                "收入（元）",
-                "收入笔数",
-                "商家提现（元）",
-                "商家提现手续费",
-                "商家提现笔数",
-                "骑手提现",
-                "骑手提现手续费",
-                "骑手提现笔数",
-                "退款金额（元）",
-                "退款笔数",
-                "期末金额（元）",
-                "平台抽成手续费");
-        data.setTitles(titleList);
-        List<List<Object>> rows = new ArrayList<>();
-        for (ShopBillVo shopBillVo:shopBillVoList ){
+        List<ShopBillVo> shopBillVoList = baseMapper.excelShopBillList(query);
+
+        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.getStartMoney());
             row.add(shopBillVo.getRevenue());
             row.add(shopBillVo.getRevenueCount());
@@ -270,8 +254,12 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
             row.add(shopBillVo.getRefundCount());
             row.add(shopBillVo.getEndMoney());
             row.add(shopBillVo.getPlatformRates());
-            rows.add(row);
-        }
+            return row;
+        }).collect(Collectors.toList());
+
+        ExcelData data = new ExcelData();
+        data.setName("商户对账");
+        data.setTitles(ShopBillVo.getExcelHead());
         data.setRows(rows);
         return data;
     }

src/main/resources/mapper/reconciliation/PlatformBillMapper.xml

@@ -28,9 +28,14 @@
     </select>
 
     <select id="shopBill" resultType="com.sqx.modules.reconciliation.model.ShopBillVo">
-        select pb.*,gs.shop_name as shopName,gs.phone,gs.shop_id as shopId
-        from platform_bill pb left join tb_user tu on pb.user_id =tu.user_id
-        left join goods_shop gs on gs.user_id =tu.user_id
+        select
+            pb.*,
+            gs.shop_name as shopName,
+            gs.phone,
+            gs.shop_id as shopId
+        from
+            platform_bill pb
+            left join goods_shop gs on gs.user_id = pb.user_id and gs.status = 1
         <where>
             pb.`type` = 1
             <if test="params.startDate != null and params.startDate != '' and params.startDate != 'null'">
@@ -48,6 +53,7 @@
         </where>
         order by pb.day_id desc
     </select>
+
     <select id="platformBill" resultType="com.sqx.modules.reconciliation.model.PlatformBill">
         select pb.*
         from platform_bill pb
@@ -89,9 +95,13 @@
     </select>
 
     <select id="excelShopBillList" resultType="com.sqx.modules.reconciliation.model.ShopBillVo">
-        select pb.*,gs.shop_name as shopName,gs.phone
-        from platform_bill pb left join tb_user tu on pb.user_id =tu.user_id
-        left join goods_shop gs on gs.user_id =tu.user_id
+        select
+            pb.*,
+            gs.shop_name as shopName,
+            gs.phone
+        from
+            platform_bill pb
+            left join goods_shop gs on gs.user_id = pb.user_id and gs.status = 1
         <where>
             pb.`type` = 1
             <if test="params.startDate != null and params.startDate != '' and params.startDate != 'null'">