From 1a11e4022a6b53a82bb45cda009ae653cdb55ab2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 24 十月 2023 10:59:03 +0800
Subject: [PATCH] # 财务管理 修改
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 12 +++++++-----
1 files changed, 7 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 302ef01..8ac7cff 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
@@ -306,12 +306,13 @@
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
+ log.setActInfo(memberRides.getInfo());
//璁板綍鎿嶄綔鏃ュ織
actionLogMapper.insert(log);
@@ -357,7 +358,7 @@
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
- update.setDuration( freeRentTime > rideTime ? 0 : rideTime);
+ update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
//update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
//淇敼鍓�
@@ -390,14 +391,15 @@
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
+ log.setType(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());
+ log.setActInfo(memberRides.getInfo());
//璁板綍鎿嶄綔鏃ュ織
actionLogMapper.insert(log);
--
Gitblit v1.9.3