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/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
index 95286b8..9740820 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -2,14 +2,15 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.dto.CountCyclePriceDTO;
-import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
-import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
-import com.doumee.dao.business.dto.SmsCheckDTO;
+import com.doumee.dao.business.dto.*;
 import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.vo.ApplyPowerVO;
 import com.doumee.dao.business.vo.CountCyclePriceVO;
+import com.doumee.service.business.impl.UnionApplyServiceImpl;
 import com.jzq.common.bean.sign.NotifyDataReq;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +28,7 @@
      */
     Integer create(InsuranceApply insuranceApply);
     Integer updateData(InsuranceApply insuranceApply);
+    void checkMemberSolution(Integer solutionId,String idCode,String memberName,Date startTime,Date endTime,Integer applyId);
 
     /**
      * 涓婚敭鍒犻櫎
@@ -115,7 +117,14 @@
 
     Integer   dealBackApply(InsuranceApply insuranceApply);
 
-    Integer check(InsuranceApply insuranceApply);
+    Integer check(InsuranceApply insuranceApply, UnionApplyServiceImpl unionApplyServiceImpl);
+
+    /**
+     * 澶嶅涓氬姟
+     * @param insuranceApply
+     * @return
+     */
+    Integer reexamineCheck(InsuranceApply insuranceApply);
 
     InsuranceApply  findDetailForExport(InsuranceApply model);
 
@@ -127,7 +136,7 @@
 
     String getSignLink(Integer id);
 
-    void dealSignResult(NotifyDataReq data);
+    String dealSignResult(NotifyDataReq data);
 
     void dealWaitSignedData();
 
@@ -168,5 +177,12 @@
      * @return
      */
     Integer guaranteeNum();
+
+    /**
+     * 鏍规嵁淇濆崟鏌ヨ鏄惁鍙互杩涜鍔犲噺淇濇搷浣�
+     * @param applyPowerDTO
+     * @return
+     */
+    ApplyPowerVO getApplyPower(ApplyPowerDTO applyPowerDTO);
 }
 

--
Gitblit v1.9.3