|
|
|
@@ -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)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|