From c86d30c265e90ba485bc7d21510451475c4dce01 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 30 Jul 2024 09:43:59 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A2=84=E7=BA=A6=E5=85=85=E7=94=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uniapp/customer/PersonPileController.java  | 18 ++++++------------
 .../impl/PileReservationInfoServiceImpl.java   |  4 ----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
index 1a35074de..157095a8b 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
@@ -319,7 +319,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/createReserved")
     public RestApiResponse<?> createReserved(HttpServletRequest request, @RequestBody CreateReservedDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
@@ -343,7 +342,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/queryReservedList")
     public RestApiResponse<?> queryReservedList(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
@@ -367,7 +365,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/updateReservation")
     public RestApiResponse<?> updateReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
@@ -375,13 +372,13 @@ public class PersonPileController extends BaseController {
             pileReservationInfoService.updateReservation(dto);
             response = new RestApiResponse<>();
         } catch (BusinessException e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("修改预约充电信息error, params:{}", dto, e);
             response = new RestApiResponse<>(e.getCode(), e.getMessage());
         } catch (Exception e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("修改预约充电信息error, params:{}", dto, e);
             response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
         }
-        logger.info("修改预约充电状态params:{}, result:{}", dto, response);
+        logger.info("修改预约充电信息params:{}, result:{}", dto, response);
         return response;
     }
 
@@ -391,7 +388,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/updateReservedStatus")
     public RestApiResponse<?> updateReservedStatus(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
@@ -415,7 +411,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/deleteReservation")
     public RestApiResponse<?> deleteReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
@@ -423,13 +418,13 @@ public class PersonPileController extends BaseController {
             pileReservationInfoService.deleteReservation(dto);
             response = new RestApiResponse<>();
         } catch (BusinessException e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("删除预约error, params:{}", dto, e);
             response = new RestApiResponse<>(e.getCode(), e.getMessage());
         } catch (Exception e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("删除预约error, params:{}", dto, e);
             response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
         }
-        logger.info("修改预约充电状态params:{}, result:{}", dto, response);
+        logger.info("删除预约params:{}, result:{}", dto, response);
         return response;
     }
 
@@ -439,7 +434,6 @@ public class PersonPileController extends BaseController {
      */
     @PostMapping("/queryReservationInfo")
     public RestApiResponse<?> queryReservationInfo(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
         RestApiResponse<?> response = null;
         try {
             String memberId = getMemberIdByAuthorization(request);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
index 6b7250f78..900e0851c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
@@ -412,10 +412,6 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
         if (pileReservationInfo == null) {
             return;
         }
-        if (!StringUtils.equals(dto.getMemberId(), pileReservationInfo.getMemberId())) {
-            return;
-        }
-
         if (StringUtils.isNotBlank(dto.getStartTime())) {
             pileReservationInfo.setStartTime(Time.valueOf(dto.getStartTime()));
         }