From 9affda28f6b10386353b4821d00eb7163375b078 Mon Sep 17 00:00:00 2001
From: chendaze <1824191732@qq.com>
Date: Mon, 8 Jul 2024 14:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/meeting/ApiRoomContentController.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
index 77df321..5b9b3ee 100644
--- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
+++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
@@ -261,6 +261,12 @@ public class ApiRoomContentController extends BaseController {
             String prepayId = wxPayCommon.wxJsApiPay(wxChatBasePayDto);
             reservation.setPrepayId(prepayId);
             reservation.setStauts(Reservation.Status.TO_BE_PAID);
+            Long userId = reservation.getUserId();
+
+            if (reservation.getCreateBy() ==null){
+                reservation.setCreateBy(customerStaff.getUsername());
+            }
+//            reservation.setCreateBy();
             boolean save = reservationService.save(reservation);
 
             if (save) {
@@ -319,6 +325,9 @@ public class ApiRoomContentController extends BaseController {
             Long id = reservation.getId();
             return toAjax(save).put("reservationId", id);
         } else {
+            if (reservation.getCreateBy() ==null){
+                reservation.setCreateBy(customerStaff.getUsername());
+            }
             boolean save = reservationService.save(reservation);
             if (save) {
                 if (null != reservation.getTicketId()) {
@@ -361,15 +370,12 @@ public class ApiRoomContentController extends BaseController {
                     }
                     if (CollUtil.isNotEmpty(ids)) {
                         for (Long id : ids) {
-//                            UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
-//                            if (null == equipment) {
                             UserEquipment userEquipment = new UserEquipment();
                             userEquipment.setEquipmentId(id);
                             userEquipment.setUserId(reservation.getUserId());
                             userEquipment.setStartTime(reservation.getStartTime());
                             userEquipment.setEndDate(reservation.getEndDate());
                             userEquipmentService.insertUserEquipment(userEquipment);
-//                            }
                         }
                     }
                 }