From ad859ed5edd62f1db38c1652daa858a79487f738 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 21:36:36 +0800 Subject: [PATCH] fix --- .../controller/market/WxFinanceController.java | 16 ++++++++++++++++ .../com/iformall/domain/po/WxFinanceReceive.java | 2 ++ .../service/impl/WxFinancePrintServiceImpl.java | 3 +++ 3 files changed, 21 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 ed675efc0..8758db8ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -369,6 +369,22 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("过账列表") + @GetMapping("finishReceiveList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData finishList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { + if (null == record.getFinishId()) { + return new ResultData(Result.ERROR,"finishId参数不能为空"); + } + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + PageInfo page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("过账") @PostMapping("receiveFinish") public ResultData receiveFinish(@RequestBody WxFinanceReceive record) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 0ba950744..e6387bf71 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -158,5 +158,7 @@ public class WxFinanceReceive extends TenantEntity { private String shopIds; @TableField(exist = false) private Integer finishStatus; + @TableField(exist = false) + private Long finishId; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index a7a084ccd..6e39a50f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -115,6 +115,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { t.setUpdateTime(new Date()); t.setName(t.getName()+"复制"); t.setIsDel(EnumYesOrNo.NO.getCode()); + if (StringUtils.isNotBlank(t.getContent())) { + t.setContent(t.getContent().replaceAll("uuid", "olduuid")); + } wxFinancePrintTemplateMapper.insert(t); }