From 68f2fe256fc3ad8446ee4734b3d851d47c93a4b1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 26 Oct 2024 22:38:41 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 96c6f662a..02f563338 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -311,7 +311,7 @@ public class WxFinanceController extends BaseController { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } if (!this.isValidPayTime(record.getReceiveDate(),record)) { - return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); + return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); } Map map = wxFinanceService.createReceive(record,this.getUser()); return new ResultData(map); @@ -328,7 +328,7 @@ public class WxFinanceController extends BaseController { return new ResultData(Result.ERROR,"请选择支付时间"); } if (!this.isValidPayTime(record.getReceiveDate(),record)) { - return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); + return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); } wxFinanceService.updateReceive(record,this.getUser()); return new ResultData(); @@ -374,7 +374,7 @@ public class WxFinanceController extends BaseController { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } if (!this.isValidPayTime(record.getReceiveDate(),record)) { - return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); + return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); } Map map = wxFinanceService.createPay(record,this.getUser()); return new ResultData(map); @@ -517,7 +517,9 @@ public class WxFinanceController extends BaseController { @ApiOperation("红冲") @PostMapping("receiveRedSet") public ResultData receiveRedSet(@RequestBody WxFinanceReceive record) { - + if (!this.isValidPayTime(new Date(),record)) { + return new ResultData(Result.ERROR,"当前时间已结账,不允许操作"); + } WxFinanceReceive receive = wxFinanceService.getReceiveById(this.getTenantInfo(), record.getId()); if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) { return new ResultData(Result.ERROR,"该状态不允许操作");