From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 8e97fb1..a06fdd9 100644
--- a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -7,9 +7,15 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.ApplyPowerDTO;
+import com.doumee.dao.business.dto.CountCyclePriceDTO;
 import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
 import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.vo.ApplyPowerVO;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
+import com.doumee.service.business.InsuranceApplyOnService;
 import com.doumee.service.business.InsuranceApplyService;
+import com.doumee.service.business.impl.UnionApplyServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -33,6 +39,12 @@
     @Autowired
     private InsuranceApplyService insuranceApplyService;
 
+    @Autowired
+    private InsuranceApplyOnService insuranceApplyOnService;
+
+    @Autowired
+    private UnionApplyServiceImpl unionApplyServiceImpl;
+
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
@@ -44,13 +56,21 @@
     @PostMapping("/check")
     @RequiresPermissions("business:insuranceapply:check")
     public ApiResponse check(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.check(insuranceApply));
+        return ApiResponse.success(insuranceApplyService.check(insuranceApply,unionApplyServiceImpl));
     }
-    @ApiOperation("鍟嗘埛閫�鍥炴姇淇�")
+
+    @ApiOperation("鎶曚繚澶嶅")
+    @PostMapping("/reexamineCheck")
+    @RequiresPermissions("business:insuranceapply:check")
+    public ApiResponse reexamineCheck(@RequestBody InsuranceApply insuranceApply) {
+        return ApiResponse.success(insuranceApplyService.reexamineCheck(insuranceApply));
+    }
+
+    @ApiOperation("鍟嗘埛閫�鍥炵敵璇�")
     @PostMapping("/back")
     @RequiresPermissions("business:insuranceapply:back")
     public ApiResponse back(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.back(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.back(insuranceApply));
     }
     @ApiOperation("鍒楄〃")
     @PostMapping("/findListByDTO")
@@ -63,13 +83,13 @@
     @PostMapping("/closeWtbForShop")
     @RequiresPermissions("business:insuranceapply:back")
     public ApiResponse closeWtbForShop(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.closeWtbForShop(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.closeWtbForShop(insuranceApply));
     }
     @ApiOperation("鍟嗘埛涓婁紶鎶曚繚鍗�")
     @PostMapping("/uploadToubaodan")
     @RequiresPermissions("business:insuranceapply:uploadToubaodan")
     public ApiResponse uploadToubaodan(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.uploadToubaodan(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.uploadToubaodan(insuranceApply));
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -84,13 +104,13 @@
     @PostMapping("/uploadBaoxiandan")
     @RequiresPermissions("business:insuranceapply:uploadBaoxiandan")
     public ApiResponse uploadBaoxiandan(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.uploadBaoxiandan(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.uploadBaoxiandan(insuranceApply));
     }
     @ApiOperation("鍟嗘埛澶勭悊閫�鍗曠敵璇�")
     @PostMapping("/dealBackApply")
     @RequiresPermissions("business:insuranceapply:dealBackApply")
     public ApiResponse dealBackApply(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.dealBackApply(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.dealBackApply(insuranceApply));
     }
     @ApiOperation("鍟嗘埛淇敼淇濋櫓鍗�")
     @PostMapping("/editBaoxiandan")
@@ -156,4 +176,18 @@
     public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
         return ApiResponse.success(insuranceApplyService.findDetail(id));
     }
+
+    @ApiOperation("鑾峰彇淇濆崟姝㈡湡涓庡垵濮嬮噾棰�")
+    @PostMapping("/getCountCyclePriceVO")
+    public ApiResponse<CountCyclePriceVO> getCountCyclePriceVO (@RequestBody CountCyclePriceDTO countCyclePriceDTO) {
+        return ApiResponse.success("鎿嶄綔鎴愬姛",insuranceApplyService.getCountCyclePriceVO(countCyclePriceDTO));
+    }
+
+
+    @ApiOperation("鏌ヨ淇濆崟鏄惁鍙繘琛屽姞鍑忎繚")
+    @PostMapping("/getApplyPower")
+    @RequiresPermissions("business:insuranceapply:query")
+    public ApiResponse<ApplyPowerVO> getApplyPower(@RequestBody ApplyPowerDTO applyPowerDTO) {
+        return ApiResponse.success(insuranceApplyService.getApplyPower(applyPowerDTO));
+    }
 }

--
Gitblit v1.9.3