From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 448d72e..c1ab843 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
@@ -604,7 +604,7 @@
         //杞﹁締璁板綍
         Bikes bikes = dealBikesByParam(model);
         //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
-        if(locks.getStatus() == Constants.LockStatus.open){
+        if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
             //濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
             MemberRides memberRides = new MemberRides();
             memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -621,7 +621,7 @@
             update.setId(memberRides.getId());
             //锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
             memberRidesMapper.updateById( update);
-        }else   if(locks.getStatus() == Constants.LockStatus.closed ){
+        }else   if(Constants.formatIntegerNum(locks.getStatus())  == Constants.LockStatus.closed ){
             //濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
             if(StringUtils.isNotBlank(locks.getBikeCode())){
                 MemberRides mbikes = new MemberRides();
@@ -657,6 +657,10 @@
 
     @Override
     public void autoRefreshLockStatus() {
+//        memberRidesMapper.update(null,new UpdateWrapper<MemberRides>().lambda()
+//                        .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+//                .apply(""  )
+//                .set(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()))
 
         QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
         wrapper.lambda()
@@ -665,9 +669,9 @@
         List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
         if (!CollectionUtils.isEmpty(memberRides)){
             memberRides.forEach(s->{
-                Integer between = DateUtil.between(s.getCreateDate(), new Date());
+                Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
                 // 澶т簬闃堝��
-                if (between >= 2){
+                if (between >= 20){
                     s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
                     s.setEditDate(new Date());
                     memberRidesMapper.updateById(s);
@@ -792,7 +796,7 @@
             if(Objects.nonNull(sites)){
                 Sites sites1 = new Sites();
                 sites1.setId(sites.getId());
-                sites1.setLockNum(sites.getLockNum()+1);
+                sites1.setLockNum(Constants.formatIntegerNum(sites.getLockNum())+1);
                 sitesMapper.updateById(sites1);
             }
         }else{

--
Gitblit v1.9.3