| @@ -689,6 +689,14 @@ public class WxFinanceController extends BaseController { | |||||
| return new ResultData(page); | 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("交款收付单列表") | @ApiOperation("交款收付单列表") | ||||
| @PostMapping("finishReceiveList") | @PostMapping("finishReceiveList") | ||||
| public ResultData finishReceiveList(@RequestBody WxFinanceFinish record) { | public ResultData finishReceiveList(@RequestBody WxFinanceFinish record) { | ||||
| @@ -82,6 +82,7 @@ public interface WxFinanceService { | |||||
| List<WxFinanceReceivePayway> getReceivePaywaysSum(WxFinanceFinish record); | List<WxFinanceReceivePayway> getReceivePaywaysSum(WxFinanceFinish record); | ||||
| List<WxFinanceReceiveBill> getReceiveFeesSum(WxFinanceFinish record); | List<WxFinanceReceiveBill> getReceiveFeesSum(WxFinanceFinish record); | ||||
| WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record); | WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record); | ||||
| WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record); | |||||
| List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record); | List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record); | ||||
| void auditReceive(WxFinanceFinish record,MallUserInfo user); | void auditReceive(WxFinanceFinish record,MallUserInfo user); | ||||
| Integer getReceiveUnFinisedCount(WxFinanceReceive record); | Integer getReceiveUnFinisedCount(WxFinanceReceive record); | ||||
| @@ -1800,6 +1800,13 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| WxFinanceReceive fr = generateReceiveQueryByFinish(record); | WxFinanceReceive fr = generateReceiveQueryByFinish(record); | ||||
| return wxFinanceReceiveMapper.getReceiveSum(fr); | 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 | @Override | ||||
| public List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record) { | public List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record) { | ||||