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 7f0e43e87..343912d93 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -689,6 +689,14 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("交款红冲总计") + @PostMapping("finishRedSetSum") + public ResultData finishRedSetSum(@RequestBody WxFinanceFinish record) { + record.updateTenantInfo(getTenantInfo()); + WxFinanceReceiveSumVo page = wxFinanceService.getReceiveRedSetSumByFinish(record); + return new ResultData(page); + } + @ApiOperation("交款收付单列表") @PostMapping("finishReceiveList") public ResultData finishReceiveList(@RequestBody WxFinanceFinish record) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index fd9c098c0..9e8078a3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -82,6 +82,7 @@ public interface WxFinanceService { List getReceivePaywaysSum(WxFinanceFinish record); List getReceiveFeesSum(WxFinanceFinish record); WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record); + WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record); List getReceiveVoListByFinish(WxFinanceFinish record); void auditReceive(WxFinanceFinish record,MallUserInfo user); Integer getReceiveUnFinisedCount(WxFinanceReceive record); 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 12517e4d9..cf3e51b50 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1800,6 +1800,13 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxFinanceReceive fr = generateReceiveQueryByFinish(record); return wxFinanceReceiveMapper.getReceiveSum(fr); } + + @Override + public WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record) { + WxFinanceReceive fr = generateReceiveQueryByFinish(record); + fr.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); + return wxFinanceReceiveMapper.getReceiveSum(fr); + } @Override public List getReceiveVoListByFinish(WxFinanceFinish record) {