From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
index dc8b93d..3963599 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberInsuranceServiceImpl.java
@@ -17,6 +17,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -90,9 +91,36 @@
         memberInsurance.setIsdeleted(Constants.ZERO);
         QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
         wrapper.orderByDesc("CREATE_DATE");
+        List<MemberInsurance> memberInsuranceList = memberInsuranceMapper.selectList(wrapper);
+        for (MemberInsurance memberInsurance1:memberInsuranceList) {
+            if(memberInsurance1.getEndTime().getTime() < System.currentTimeMillis() ){
+                memberInsurance1.setIsValid(1);
+            }else{
+                memberInsurance1.setIsValid(0);
+            }
+
+        }
+        return memberInsuranceList;
+    }
+
+
+    @Override
+    public List<MemberInsurance> getList(MemberInsurance memberInsurance) {
+        memberInsurance.setIsdeleted(Constants.ZERO);
+        QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
+        if(!Objects.isNull(memberInsurance.getStatus())){
+            if(memberInsurance.getStatus().equals(Constants.ZERO)){
+                wrapper.lambda().ge(MemberInsurance::getStartTime,new Date());
+            }else{
+                wrapper.lambda().le(MemberInsurance::getStartTime,new Date());
+            }
+        }
+        wrapper.lambda().orderByDesc(MemberInsurance::getCreateDate);
         return memberInsuranceMapper.selectList(wrapper);
     }
-  
+
+
+
     @Override
     public PageData<MemberInsurance> findPage(PageWrap<MemberInsurance> pageWrap) {
         IPage<MemberInsurance> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -182,7 +210,9 @@
                 queryWrapper.orderByAsc(sortData.getProperty());
             }
         }
-        return PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
+        PageData<MemberInsurance> pageData = PageData.from(memberInsuranceMapper.selectPage(page, queryWrapper));
+
+        return pageData;
     }
 
 
@@ -192,4 +222,8 @@
         QueryWrapper<MemberInsurance> wrapper = new QueryWrapper<>(memberInsurance);
         return memberInsuranceMapper.selectCount(wrapper);
     }
+
+
+
+
 }

--
Gitblit v1.9.3