From a0f6c9c91b61503a97a17fe2ecc2775afb75fda1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:42:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index 6d6d4af..daa0872 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -84,7 +84,7 @@
comActReserveOperationRecordDO.setReserveContent(CANCEL);
comActReserveOperationRecordDO.setPhone(comActReserveRecordDO.getPhone());
comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.qx);
- comActReserveOperationRecordDO.setUserId(comActReserveRecordDO.getUserId());
+ comActReserveOperationRecordDO.setUserId(comActReserveRecord.getUserId());
comActReserveOperationRecordDO.setReserveTime(DateUtil.date());
comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO);
return R.ok();
@@ -142,13 +142,14 @@
if(reserveRecordDO != null){
//更新预约记录社区备注字段
reserveRecordDO.setActRemark(reserveRecordDTO.getRemark());
+ reserveRecordDO.setHandleId(userId);
comActReserveRecordMapper.updateById(reserveRecordDO);
//取消预约返还可参加名额
comActReserveMapper.addReserveCountById(reserveRecordDO.getReserveId());
//添加操作记录
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,reserveRecordDO.getId(),reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
- ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId,null);
+ ,"社区管理员取消预约",reserveRecordDTO.getRemark(),ComActReserveOperationRecordDO.status.qx,userId,new Date());
}
});
return R.ok();
--
Gitblit v1.7.1