diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java index cb4f76b67..f376bc360 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -65,9 +65,9 @@ public class BillDailyAsyncTask { public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { ImportParams params = new ImportParams(); // 需要验证 - params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*"}); + params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"}); IExcelDataHandler handler = new BillDailyAsyncTask.BillDailyExcelHandler(); - handler.setNeedHandlerFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*"}); + handler.setNeedHandlerFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"}); params.setNeedVerify(true); ExcelImportResult datalist = null; @@ -101,6 +101,7 @@ public class BillDailyAsyncTask { WxShop shop = new WxShop(); shop.setShopNumber(vo.getShopNumber()); shop.setTenantId(tenantId); + shop.setType(vo.getRentShopType()); shop.setStatus(EnumShopStatus.RENT.getCode()); shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); WxShop wxShop = wxShopMapper.selectOne(shop); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 24e173c8d..56ea9641e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -82,8 +82,9 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") - private Integer rentShopType; + @Excel(name = "租赁商铺类型*", orderNum = "6", width = 20, replace = {"店铺_1", "多经点位_2"}) + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 348ebd22a..85418a705 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -227,6 +227,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { v1.setPayStr("0"); v1.setReceiveDate(new Date()); v1.setExpiredDay(0L); + v1.setRentShopType(1); list.add(v1); v2.setShopNumber("A0002"); @@ -235,6 +236,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { v2.setPayStr("0"); v2.setReceiveDate(new Date()); v2.setExpiredDay(0L); + v2.setRentShopType(2); list.add(v2); excelService.exportExcel(list, null, "水电费模板", WxBillDailyVo.class, "水电费模板.xlsx", response, true);