From 42e41f149a27f6586483ce08b513623c3fb4c993 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 24 Oct 2024 14:14:34 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 24 +++++++------------ .../iformall/common/SysConfigConstant.java | 1 - .../iformall/service/WxFinanceService.java | 1 - .../service/impl/WxFinanceServiceImpl.java | 5 ---- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 304c1e168..deecd537f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -769,22 +769,16 @@ public class WxFinanceController extends BaseController { return new ResultData(); } - @ApiOperation("截止时间") - @GetMapping("getReceiveEndTime") - public ResultData getReceiveEndTime() { - return new ResultData(wxFinanceService.getFinishEndTime(this.getTenantInfo())); - } - 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; } diff --git a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java index 83ecf6b92..533684207 100644 --- a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java +++ b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java @@ -12,6 +12,5 @@ public class SysConfigConstant { public static final String merchant_Login_CheckPhone = "merchantLoginCheckPhone"; public static final String bill_before_days = "billBeforeDays"; 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"; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 4a18d69aa..f1efe4c8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -86,5 +86,4 @@ public interface WxFinanceService { Integer getReceiveUnFinisedCount(WxFinanceReceive record); void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); void deleteFinish(WxFinanceFinish record); - SysConfig getFinishEndTime(TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 826e0739f..33f6bf07a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1674,11 +1674,6 @@ public class WxFinanceServiceImpl implements WxFinanceService { wxFinanceReceiveMapper.updateFinish(fr); } - @Override - public SysConfig getFinishEndTime(TenantEntity tenantEntity) { - return sysConfigService.getByKey(SysConfigConstant.finance_receive_end_date, tenantEntity); - } - @Override public List getReceiveFinishCount(WxFinanceFinish record) { WxFinanceReceive fr = generateReceiveQueryByFinish(record);