| @@ -311,7 +311,7 @@ public class WxFinanceController extends BaseController { | |||||
| return new ResultData(Result.ERROR,"请选择账单和支付方式"); | return new ResultData(Result.ERROR,"请选择账单和支付方式"); | ||||
| } | } | ||||
| if (!this.isValidPayTime(record.getReceiveDate(),record)) { | if (!this.isValidPayTime(record.getReceiveDate(),record)) { | ||||
| return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); | |||||
| return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); | |||||
| } | } | ||||
| Map map = wxFinanceService.createReceive(record,this.getUser()); | Map map = wxFinanceService.createReceive(record,this.getUser()); | ||||
| return new ResultData(map); | return new ResultData(map); | ||||
| @@ -328,7 +328,7 @@ public class WxFinanceController extends BaseController { | |||||
| return new ResultData(Result.ERROR,"请选择支付时间"); | return new ResultData(Result.ERROR,"请选择支付时间"); | ||||
| } | } | ||||
| if (!this.isValidPayTime(record.getReceiveDate(),record)) { | if (!this.isValidPayTime(record.getReceiveDate(),record)) { | ||||
| return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); | |||||
| return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); | |||||
| } | } | ||||
| wxFinanceService.updateReceive(record,this.getUser()); | wxFinanceService.updateReceive(record,this.getUser()); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -374,7 +374,7 @@ public class WxFinanceController extends BaseController { | |||||
| return new ResultData(Result.ERROR,"请选择账单和支付方式"); | return new ResultData(Result.ERROR,"请选择账单和支付方式"); | ||||
| } | } | ||||
| if (!this.isValidPayTime(record.getReceiveDate(),record)) { | if (!this.isValidPayTime(record.getReceiveDate(),record)) { | ||||
| return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); | |||||
| return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); | |||||
| } | } | ||||
| Map map = wxFinanceService.createPay(record,this.getUser()); | Map map = wxFinanceService.createPay(record,this.getUser()); | ||||
| return new ResultData(map); | return new ResultData(map); | ||||
| @@ -517,7 +517,9 @@ public class WxFinanceController extends BaseController { | |||||
| @ApiOperation("红冲") | @ApiOperation("红冲") | ||||
| @PostMapping("receiveRedSet") | @PostMapping("receiveRedSet") | ||||
| public ResultData receiveRedSet(@RequestBody WxFinanceReceive record) { | 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()); | WxFinanceReceive receive = wxFinanceService.getReceiveById(this.getTenantInfo(), record.getId()); | ||||
| if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) { | if (receive.getIsFinish().intValue() == EnumYesOrNo.NO.getCode().intValue()) { | ||||
| return new ResultData(Result.ERROR,"该状态不允许操作"); | return new ResultData(Result.ERROR,"该状态不允许操作"); | ||||