| @@ -769,22 +769,16 @@ public class WxFinanceController extends BaseController { | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @ApiOperation("截止时间") | |||||
| @GetMapping("getReceiveEndTime") | |||||
| public ResultData getReceiveEndTime() { | |||||
| return new ResultData(wxFinanceService.getFinishEndTime(this.getTenantInfo())); | |||||
| } | |||||
| private boolean isValidPayTime(Date date) { | private boolean isValidPayTime(Date date) { | ||||
| SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo()); | |||||
| String fdatestr = sysconfig.getConfigItemValue(); | |||||
| if (StringUtils.isBlank(fdatestr)) { | |||||
| return true; | |||||
| } | |||||
| Date fdate = DateUtils.stringToDate(fdatestr, DateUtils.DATE_TIME_PATTERN); | |||||
| if (date.after(fdate)) { | |||||
| return true; | |||||
| } | |||||
| // SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo()); | |||||
| // String fdatestr = sysconfig.getConfigItemValue(); | |||||
| // if (StringUtils.isBlank(fdatestr)) { | |||||
| // return true; | |||||
| // } | |||||
| // Date fdate = DateUtils.stringToDate(fdatestr, DateUtils.DATE_TIME_PATTERN); | |||||
| // if (date.after(fdate)) { | |||||
| // return true; | |||||
| // } | |||||
| return false; | return false; | ||||
| } | } | ||||
| @@ -12,6 +12,5 @@ public class SysConfigConstant { | |||||
| public static final String merchant_Login_CheckPhone = "merchantLoginCheckPhone"; | public static final String merchant_Login_CheckPhone = "merchantLoginCheckPhone"; | ||||
| public static final String bill_before_days = "billBeforeDays"; | public static final String bill_before_days = "billBeforeDays"; | ||||
| public static final String bill_near_days = "billNearDays"; | public static final String bill_near_days = "billNearDays"; | ||||
| public static final String finance_receive_end_date = "financeReceiveEndDate"; | |||||
| public static final String rent_share_bill_rate = "rentsharebillrate"; | public static final String rent_share_bill_rate = "rentsharebillrate"; | ||||
| } | } | ||||
| @@ -86,5 +86,4 @@ public interface WxFinanceService { | |||||
| Integer getReceiveUnFinisedCount(WxFinanceReceive record); | Integer getReceiveUnFinisedCount(WxFinanceReceive record); | ||||
| void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); | void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); | ||||
| void deleteFinish(WxFinanceFinish record); | void deleteFinish(WxFinanceFinish record); | ||||
| SysConfig getFinishEndTime(TenantEntity tenantEntity); | |||||
| } | } | ||||
| @@ -1674,11 +1674,6 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| wxFinanceReceiveMapper.updateFinish(fr); | wxFinanceReceiveMapper.updateFinish(fr); | ||||
| } | } | ||||
| @Override | |||||
| public SysConfig getFinishEndTime(TenantEntity tenantEntity) { | |||||
| return sysConfigService.getByKey(SysConfigConstant.finance_receive_end_date, tenantEntity); | |||||
| } | |||||
| @Override | @Override | ||||
| public List<WxFinanceReceiveCountVo> getReceiveFinishCount(WxFinanceFinish record) { | public List<WxFinanceReceiveCountVo> getReceiveFinishCount(WxFinanceFinish record) { | ||||
| WxFinanceReceive fr = generateReceiveQueryByFinish(record); | WxFinanceReceive fr = generateReceiveQueryByFinish(record); | ||||