From 77eaafed3ddf06929a7ed04f50197fac982f2c46 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 16:48:12 +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 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 1a1a119..4d3dffc 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
@@ -220,10 +220,16 @@
         }
         return memberRides.getBikeCode();
     }
+
+    /**
+     * 楠戣鏃堕暱淇敼
+     * @param memberRides
+     */
     @Override
     public  void updateDuration(MemberRides memberRides){
         LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(StringUtils.isBlank(memberRides.getMemberId())
+                ||StringUtils.isBlank(memberRides.getBackReason())
                 || memberRides.getDuration() == null){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
@@ -255,6 +261,8 @@
 
         ActionLog log = new ActionLog();
         log.setId(Constants.getUUID());
+        log.setActInfo(memberRides.getBackInfo());
+        log.setActReason(memberRides.getBackReason());
         log.setIsdeleted(Constants.ZERO);
         log.setCreateDate(update.getBackDate());
         log.setCreator(user.getId());
@@ -328,6 +336,8 @@
         log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
         log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
         log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
+        log.setActInfo(memberRides.getBackInfo());
+        log.setActReason(memberRides.getBackReason());
         //璁板綍鎿嶄綔鏃ュ織
         actionLogMapper.insert(log);
 

--
Gitblit v1.9.3