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/InsuranceApplyController.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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 05f66f7..0a19a5e 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,14 @@
 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.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 +38,9 @@
     @Autowired
     private InsuranceApplyService insuranceApplyService;
 
+    @Autowired
+    private UnionApplyServiceImpl unionApplyServiceImpl;
+
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
@@ -44,8 +52,16 @@
     @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("鎶曚繚澶嶅")
+    @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")
@@ -156,4 +172,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