diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 28f8819d9..a72eaec88 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -224,16 +224,18 @@ public class WxBillAllServiceImpl implements WxBillAllService { Row row = sheet.createRow(0); Cell shopNumberCell = row.createCell(0); Cell merchantNameCell = row.createCell(1); - Cell billNameCell = row.createCell(2); - Cell receivePayCell = row.createCell(3); - Cell payCell = row.createCell(4); - Cell oweCell = row.createCell(5); - Cell receiveDateCell = row.createCell(6); - Cell expiredDayCell = row.createCell(7); - Cell statusCell = row.createCell(8); + Cell shopTypeCell = row.createCell(2); + Cell billNameCell = row.createCell(3); + Cell receivePayCell = row.createCell(4); + Cell payCell = row.createCell(5); + Cell oweCell = row.createCell(6); + Cell receiveDateCell = row.createCell(7); + Cell expiredDayCell = row.createCell(8); + Cell statusCell = row.createCell(9); shopNumberCell.setCellValue("商铺号"); merchantNameCell.setCellValue("商户名称"); + shopTypeCell.setCellValue("商铺类型"); billNameCell.setCellValue("费用类型"); receivePayCell.setCellValue("实际应收金额(元)"); payCell.setCellValue("实收金额(元)"); @@ -246,17 +248,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { row = sheet.createRow(i + 1); shopNumberCell = row.createCell(0); merchantNameCell = row.createCell(1); - billNameCell = row.createCell(2); - receivePayCell = row.createCell(3); - payCell = row.createCell(4); - oweCell = row.createCell(5); - receiveDateCell = row.createCell(6); - expiredDayCell = row.createCell(7); - statusCell = row.createCell(8); + shopTypeCell = row.createCell(2); + billNameCell = row.createCell(3); + receivePayCell = row.createCell(4); + payCell = row.createCell(5); + oweCell = row.createCell(6); + receiveDateCell = row.createCell(7); + expiredDayCell = row.createCell(8); + statusCell = row.createCell(9); Map billMap = billList.get(i); logger.info(billMap.toString()); shopNumberCell.setCellValue(billMap.get("shopNumber").toString()); merchantNameCell.setCellValue(billMap.get("merchantName").toString()); + shopTypeCell.setCellValue(EnumRentShopType.getEnum((Integer) billMap.get("rentShopType")).getMessage()); billNameCell.setCellValue(billMap.get("name").toString()); BigDecimal needPay = new BigDecimal(billMap.get("pay").toString()).divide(new BigDecimal(100)); payCell.setCellValue(needPay.toString());