| @@ -65,9 +65,9 @@ public class BillDailyAsyncTask { | |||||
| public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { | public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { | ||||
| ImportParams params = new ImportParams(); | ImportParams params = new ImportParams(); | ||||
| // 需要验证 | // 需要验证 | ||||
| params.setImportFields(new String[]{"商铺号", "费用类型", "实际应收金额(元)", "实收金额(元)", "缴款截止日期", "逾期天数"}); | |||||
| params.setImportFields(new String[]{"商铺号", "费用类型", "实际应收金额(元)", "实收金额(元)", "缴款截止日期"}); | |||||
| IExcelDataHandler<WxBillDailyVo> handler = new BillDailyAsyncTask.BillDailyExcelHandler(); | IExcelDataHandler<WxBillDailyVo> handler = new BillDailyAsyncTask.BillDailyExcelHandler(); | ||||
| handler.setNeedHandlerFields(new String[]{"商铺号", "费用类型", "实际应收金额(元)", "实收金额(元)", "缴款截止日期", "逾期天数"}); | |||||
| handler.setNeedHandlerFields(new String[]{"商铺号", "费用类型", "实际应收金额(元)", "实收金额(元)", "缴款截止日期"}); | |||||
| params.setNeedVerify(true); | params.setNeedVerify(true); | ||||
| ExcelImportResult<WxBillDailyVo> datalist = null; | ExcelImportResult<WxBillDailyVo> datalist = null; | ||||
| @@ -62,8 +62,6 @@ public class WxBillDaily extends BaseEntity{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| @Excel(name = "逾期天数", orderNum = "6", width = 20, numFormat = "#") | |||||
| @NotNull | |||||
| @SortColumn(column = "expiredDay") | @SortColumn(column = "expiredDay") | ||||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | ||||
| private Long expiredDay; | private Long expiredDay; | ||||
| @@ -259,12 +259,10 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDaily.setPayDate(date); | wxBillDaily.setPayDate(date); | ||||
| } | } | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, date); | int expiredDay = DateUtils.daysBetween(receiveDate, date); | ||||
| wxBillDaily.setExpiredDay(billDaily.getExpiredDay()); | |||||
| wxBillDaily.setExpiredDay(0L); | |||||
| if (expiredDay > 0) { | if (expiredDay > 0) { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | ||||
| if (billDaily.getExpiredDay().equals(0L)) { | |||||
| wxBillDaily.setExpiredDay((long) expiredDay); | |||||
| } | |||||
| wxBillDaily.setExpiredDay((long) expiredDay); | |||||
| } else { | } else { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | ||||
| } | } | ||||