From f55b38102c99878a0eb9a829ee9cf3bc8a76de01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 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 651cd0c..df2d026 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
@@ -53,6 +53,12 @@
     @Autowired
     private MemberRidesMapper memberRidesMapper;
     @Autowired
+    private HolidaysMapper holidaysMapper;
+    @Autowired
+    private PricingParamMapper pricingParamMapper;
+    @Autowired
+    private PricingDetailMapper pricingDetailMapper;
+    @Autowired
     private ActionLogMapper actionLogMapper;
 
     @Autowired
@@ -377,20 +383,19 @@
         }
         ;
         Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code", code).eq("isdeleted", Constants.ZERO).last("limit 1"));
+        if (Objects.isNull(locks)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
+        }
+        //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝e父
+        if (!locks.getStatus().equals(Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
+        }
+        if (StringUtils.isBlank(locks.getBikeCode())) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
+        }
         MqttLog flag = deviceService.openLock(locks);
         MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
         if (flag.getResult() == 0) {
-
-            if (Objects.isNull(locks)) {
-                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
-            }
-            //鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝e父
-            if (!locks.getStatus().equals(Constants.ZERO)) {
-                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
-            }
-            if (StringUtils.isBlank(locks.getBikeCode())) {
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鎵爜閿佸ご鏃犺溅杈嗕俊鎭紝鏃犳硶杩涜寮�閿�");
-            }
             //瀛樺偍楠戣璁板綍
             MemberRides memberRides = new MemberRides();
             memberRides.setId(Constants.getUUID());
@@ -458,8 +463,13 @@
             memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
             memberRides.setRentLockId(model.getId());
             memberRides.setIsdeleted(Constants.ZERO);
+            memberRides = findOne(memberRides);
+            if(memberRides == null){
+                return 0;
+            }
+
             //锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
-            memberRidesMapper.update(null,new UpdateWrapper<>(memberRides));
+            memberRidesMapper.updateById( memberRides);
         }
         return 0;
     }

--
Gitblit v1.9.3