From 4cfbc641e4c94aaedd65eb6eba78105b766348e7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 11:16:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 9681509..b275980 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -53,6 +54,8 @@
TInvoiceToBillService invoiceToBillService;
@Autowired
TokenService tokenService;
+ @Autowired
+ TTenantService tenantService;
@ApiOperation(value = "缴费账单查询分页列表")
@PostMapping("list")
@@ -111,6 +114,13 @@
@ApiOperation(value = "缴费账单开票")
@PostMapping(value = "/invoice")
public R<String> invoice(@RequestBody TInvoiceDTO dto) {
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ dto.setApplyName(tenantService.getById(userId).getResidentName());
+ String code;
+ do {
+ code = CodeGenerateUtils.generateVolumeSn();
+ } while (invoiceService.count(Wrappers.lambdaQuery(TInvoice.class).eq(TInvoice::getInvoiceNumber, code)) > 0);
+ dto.setInvoiceNumber(CodeGenerateUtils.generateVolumeSn());
// 添加开票信息
invoiceService.save(dto);
--
Gitblit v1.7.1