会员订单列表

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -212,7 +212,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         Row row1 = sheet.createRow(0);
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("YYYYMMddHHmmss");
         createHeader(row1,0,new String[]{dateTimeFormatter.format(LocalDateTime.now())+"会员订单列表"},cellStyleHeader01);
-        CellRangeAddress cellRangeAddress = new CellRangeAddress(0,0,0,9);
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(0,0,0,11);
         sheet.addMergedRegion(cellRangeAddress);
         Row row2 = sheet.createRow(1);
         Cell row2_cell1 = row2.createCell(0);
@@ -238,13 +238,27 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
 
     }
 
+    private List<String[]> getMemberOrderDataList(List<MemberOrderBo> memberOrderBoList,Integer size){
+        List<String[]> memerOrderData = new ArrayList<>();
+            String[] data = null;
+        for (MemberOrderBo memberOrderBo : memberOrderBoList) {
+              data = new String[size];
+
+              memerOrderData.add(data);
+        }
+        return null;
+    }
 
     private String[] getData(MemberOrderStatisticsBo memberOrderStatisticsBo){
+        String orderNum = String.valueOf(memberOrderStatisticsBo.getOrderNum());
         String totalAmount = String.valueOf(memberOrderStatisticsBo.getTotalAmount());
+        String diamondOrderNum = String.valueOf(memberOrderStatisticsBo.getDiamondOrderNum());
         String totalDiamondAmount = String.valueOf(memberOrderStatisticsBo.getDiamondOrderNum());
+        String goldOrderNum = String.valueOf(memberOrderStatisticsBo.getGoldOrderNum());
         String totalGoldAmount = String.valueOf(memberOrderStatisticsBo.getTotalGoldAmount());
+        String generalOrderNum = String.valueOf(memberOrderStatisticsBo.getGeneralOrderNum());
         String totalGeneralAmount = String.valueOf(memberOrderStatisticsBo.getTotalGeneralAmount());
-          return new String[]{totalAmount,totalDiamondAmount,totalGoldAmount,totalGeneralAmount};
+          return new String[]{orderNum,totalAmount,diamondOrderNum,totalDiamondAmount,goldOrderNum,totalGoldAmount,generalOrderNum,totalGeneralAmount};
     }
 
     private void createHeader(Row row, int cellStartIndex, String[] header, CellStyle cellStyle){
@@ -257,7 +271,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     }
 
     private void createCellCount(Row row,int CellStartIndex,String[] data,CellStyle cellStyle){
-        for(int i=CellStartIndex,y=0;i<data.length;i++,y++){
+        for(int i=CellStartIndex,y=0;y<data.length;i++,y++){
             Cell cell = row.createCell(i);
             cell.setCellValue(Objects.toString(data[y]));
             cell.setCellStyle(cellStyle);
@@ -379,7 +393,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
 
         List<MemberOrderBo> generalOrders = baseOrderMap.get(levelEnum.GENERAL.getDesc());
         memberOrderStatisticsBo.setGeneralOrderNum(generalOrders==null?0:generalOrders.size());
-        List<MemberOrderBo> generalHasPayOrders = baseOrderMap.get(levelEnum.GENERAL.getDesc());
+        List<MemberOrderBo> generalHasPayOrders = baseOrderHasPayMap.get(levelEnum.GENERAL.getDesc());
         generalHasPayOrders = generalHasPayOrders==null?Collections.EMPTY_LIST:generalHasPayOrders;
         BigDecimal generalAmount = generalHasPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalGeneralAmount(generalAmount);