From cffe7729a3c9f77ad1423bee2da82505a323ffa1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 六月 2024 14:08:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 755231b..b76cb10 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
@@ -7,9 +7,11 @@
 import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
 import com.doumee.dao.business.dto.SmsCheckDTO;
 import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.vo.CountCyclePriceVO;
 import com.jzq.common.bean.sign.NotifyDataReq;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +29,7 @@
      */
     Integer create(InsuranceApply insuranceApply);
     Integer updateData(InsuranceApply insuranceApply);
+    void checkMemberSolution(Integer solutionId,String idCode,String memberName,Date startTime,Date endTime);
 
     /**
      * 涓婚敭鍒犻櫎
@@ -117,17 +120,17 @@
 
     Integer check(InsuranceApply insuranceApply);
 
-     InsuranceApply  findDetailForExport(InsuranceApply model);
+    InsuranceApply  findDetailForExport(InsuranceApply model);
 
     List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model);
 
     Integer editBaoxiandan(InsuranceApply param);
 
-    void updateApplyCurrentFee(Integer id);
+    void updateApplyCurrentFee(Integer id,Integer unionId);
 
     String getSignLink(Integer id);
 
-    void dealSignResult(NotifyDataReq data);
+    String dealSignResult(NotifyDataReq data);
 
     void dealWaitSignedData();
 

--
Gitblit v1.9.3