From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
index a3b8b03..654653e 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -6,9 +6,11 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.UnionApply;
+import com.doumee.service.business.InsuranceApplyService;
import com.doumee.service.business.UnionApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,6 +33,8 @@
@Autowired
private UnionApplyService unionApplyService;
+ @Autowired
+ private InsuranceApplyService insuranceApplyService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -113,6 +117,15 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鍚堝苟鍗曞瀹�")
+ @PostMapping("/reexamineCheck")
+ @RequiresPermissions("business:unionapply:cancel")
+ public ApiResponse reexamineCheck(@RequestBody UnionApply unionApply) {
+ unionApplyService.reexamineCheck(unionApply);
+ return ApiResponse.success(null);
+ }
+
+
@PreventRepeat
@ApiOperation("涓婁紶鎶曚繚鍗�")
@PostMapping("/uploadToubaodan")
@@ -132,11 +145,20 @@
@ApiOperation("涓婁紶淇濋櫓鍗�")
@PostMapping("/uploadBXD")
- @RequiresPermissions("business:unionchange:uploadBXD")
+ @RequiresPermissions("business:unionapply:uploadBXD")
public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
unionApplyService.uploadBXD(unionApplyBXDDTO);
+ insuranceApplyService.updateApplyCurrentFee(null,unionApplyBXDDTO.getId());
+ unionApplyService.updateUnionApplyCurrentFee(unionApplyBXDDTO.getId());
return ApiResponse.success(null);
}
+ @ApiOperation("娴嬭瘯鍚堝苟鍗曞疄闄呴噾棰�")
+ @GetMapping("/testFee")
+ public ApiResponse testFee(Integer id) {
+ unionApplyService.updateUnionApplyCurrentFee(id);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3