From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/TaxesController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/TaxesController.java b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
index 8ac43c2..bc5bcdf 100644
--- a/server/company/src/main/java/com/doumee/api/business/TaxesController.java
+++ b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
@@ -10,8 +10,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.DirectInvoicingDTO;
import com.doumee.dao.business.dto.EntrustInvoicingDTO;
import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
import com.doumee.service.business.TaxesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -90,7 +92,7 @@
@ApiOperation("鑾峰彇浼佷笟淇℃伅")
@GetMapping("/getCompanyDetail")
@RequiresPermissions("business:taxes:query")
- public ApiResponse getCompanyDetail() {
+ public ApiResponse<Taxes> getCompanyDetail() {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
@@ -101,8 +103,35 @@
@ApiOperation("鎻愪氦濮旀墭鎶曟姤寮�绁�")
@PostMapping("/entrustInvoicing")
public ApiResponse entrustInvoicing(@RequestBody EntrustInvoicingDTO entrustInvoicingDTOs) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
taxesService.entrustInvoicing(entrustInvoicingDTOs);
return ApiResponse.success(null);
}
+ @ApiOperation("鎻愪氦鐩存墭鎶曟姤寮�绁�")
+ @PostMapping("/directInvoicing")
+ public ApiResponse directInvoicing(@RequestBody DirectInvoicingDTO directInvoicingDTO) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ taxesService.directInvoicing(directInvoicingDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation(value = "鑾峰彇鐩翠繚鏁版嵁淇℃伅",notes = "")
+ @GetMapping("/getDirectTaxes")
+ @RequiresPermissions("business:taxes:query")
+ public ApiResponse<List<TaxesInvoicingVO>> getDirectTaxes(@RequestParam Integer id) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ return ApiResponse.success(taxesService.getDirectTaxes(id));
+ }
+
}
--
Gitblit v1.9.3