From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 10cd917..157d180 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.TencentMailUtil;
+import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.query.TInvoiceQuery;
@@ -31,14 +33,14 @@
private TInvoiceService invoiceService;
@Autowired
TBillService tBillService;
- @PreAuthorize("@ss.hasPermi('system:invoice:list')")
+ @PreAuthorize("@ss.hasPermi('invoice:list')")
@ApiOperation(value = "获取开票列表")
@PostMapping("/list")
public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
return R.ok(invoiceService.pageList(query));
}
- @PreAuthorize("@ss.hasPermi('system:invoice:delete')")
+ @PreAuthorize("@ss.hasPermi('invoice:list:del')")
@Log(title = "开票信息-删除开票", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除开票")
@DeleteMapping(value = "/deleteById")
@@ -47,21 +49,16 @@
}
@ApiOperation(value = "关联账单信息")
- @GetMapping(value = "/getBillByInvoiceId")
- public R<PageInfo<TBill>> getBillByInvoiceId(String invoiceId){
+ @GetMapping(value = "/getBillByInvoiceId/{invoiceId}")
+ public R<PageInfo<TBillDto>> getBillByInvoiceId(@PathVariable String invoiceId){
return R.ok(tBillService.getBillByInvoiceId(invoiceId));
}
@ApiOperation(value = "上传开票凭证")
@PostMapping("/uploadVoucher")
+ @PreAuthorize("@ss.hasPermi('invoice:list:payment')")
public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
- TInvoice tInvoice = new TInvoice();
- tInvoice.setId(query.getId());
- tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
- tInvoice.setInvoiceTime(query.getInvoiceTime());
- tInvoice.setStatus(2);
- return R.ok(invoiceService.updateById(tInvoice));
+ return R.ok(invoiceService.uploadVoucher(query));
}
-
}
--
Gitblit v1.7.1