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 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 a52597a..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
@@ -457,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