From e2682188fe22b1e6ace8967946898b330e179337 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 24 Oct 2024 14:18:57 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 15 +++++++++++++++ .../com/iformall/service/WxFinanceService.java | 4 ++++ .../service/impl/WxFinanceServiceImpl.java | 7 +++++++ 3 files changed, 26 insertions(+) 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 deecd537f..e59d9ac44 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; +import com.iformall.domain.po.WxFinanceCheckOut; import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinanceFinishReceive; import com.iformall.domain.po.WxFinanceReceive; @@ -769,6 +770,20 @@ public class WxFinanceController extends BaseController { return new ResultData(); } + + @ApiOperation("结账列表") + @GetMapping("checkOutList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns("period desc"); + PageInfo page = wxFinanceService.finishListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } + private boolean isValidPayTime(Date date) { // SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo()); // String fdatestr = sysconfig.getConfigItemValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index f1efe4c8f..ae1bbd26a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFeesShop; +import com.iformall.domain.po.WxFinanceCheckOut; import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinanceFinishReceive; import com.iformall.domain.po.WxFinanceReceive; @@ -86,4 +87,7 @@ public interface WxFinanceService { Integer getReceiveUnFinisedCount(WxFinanceReceive record); void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); void deleteFinish(WxFinanceFinish record); + + //结账 + PageInfo finishListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize); } 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 33f6bf07a..bb6cf2956 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -18,6 +18,7 @@ import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFeesSetoff; import com.iformall.domain.po.WxEnergyFeesShop; +import com.iformall.domain.po.WxFinanceCheckOut; import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinanceFinishReceive; import com.iformall.domain.po.WxFinancePrintData; @@ -1921,6 +1922,12 @@ public class WxFinanceServiceImpl implements WxFinanceService { wxFinanceFinishMapper.deleteByConditon(record); } + @Override + public PageInfo finishListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize) { + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceCheckOutMapper.findList(record)); + return page; + } + }