From 96e9e831150d75ab0c9b3717ebf31bf769bbafe6 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 16 Aug 2024 00:46:06 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/rent/WxAllBillController.java | 6 +++--- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 4c52dcaca..c5141efd5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -265,12 +265,12 @@ public class WxAllBillController extends BillBaseController { @ApiOperation("预览结算单") @PostMapping("viewSettleTemplate") @TenantIgnore - public ResultData viewSettleTemplate(@RequestBody WxMerchant merchant,Long templateId) { - if (null == merchant.getId() || null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { + public ResultData viewSettleTemplate(@RequestBody WxMerchant merchant) { + if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { return new ResultData(Result.ERROR,"清选择商户和科目"); } WxMerchantBillVo vo = getMerchantBillVo(merchant); - return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),templateId,merchant.getFeesIdList(),vo)); + return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo)); } /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index ff48f263d..43d5d724b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -488,5 +488,7 @@ public class WxMerchant extends TenantEntity { public Integer isPreview; @TableField(exist = false) public List feesIdList; + @TableField(exist = false) + public Long templateId; }