From 78d4f55a5286144e98d84b6a88c82a7541c4575e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 十月 2023 14:03:53 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 7d70fe3..24b3669 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -217,8 +217,8 @@
                 .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                 .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
                 .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
-        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
-        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+        queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
+        queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate());
         queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
         queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
         queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
@@ -580,6 +580,27 @@
         return 0;
     }
 
+
+    @Override
+    public void autoRefreshLockStatus() {
+
+        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+                .eq(MemberRides::getIsdeleted,Constants.ZERO);
+        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
+        if (!CollectionUtils.isEmpty(memberRides)){
+            memberRides.forEach(s->{
+                Integer between = DateUtil.between(s.getCreateDate(), new Date());
+                // 澶т簬闃堝��
+                if (between > 2){
+                    s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+                    memberRidesMapper.updateById(s);
+                }
+            });
+        }
+    }
+
     private Bikes dealBikesByParam(Locks model) {
         if(StringUtils.isNotBlank(model.getBikeCode())){
             UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();

--
Gitblit v1.9.3