退款、核销修改预约状态

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/ReservationService.java

@@ -65,6 +65,13 @@ public interface ReservationService extends IService<Reservation> {
      */
     void updateReservationsStatus(Long id, ReserveStatus status) ;
 
+    /**
+     * 根据订单号更新预约单的状态
+     * @param orderId 订单ID
+     * @param status 预约单的状态
+     */
+    void updateStatusByOrderId(Long orderId, ReserveStatus status) ;
+
 
     /**
      * 预约详情

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.model.Scope;
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderReturnApplyIdsDTO;
 import com.chelvc.cloud.vehicle.client.dto.OrderReturnApplyDTO;
@@ -19,6 +20,7 @@ import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderItemService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderReturnApplyService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderService;
+import com.chelvc.cloud.vehicle.server.service.ReservationService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
@@ -54,6 +56,8 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
 
     private final UserClient userClient;
 
+    private final ReservationService reservationService;
+
     /**
      * 查询订单退货申请
      *
@@ -94,6 +98,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
         omsOrderReturnApply.setCreateTime(new Date());
         this.save(omsOrderReturnApply);
         this.omsOrderService.updateOrderStatus(param.getOrderId(),6);
+        this.reservationService.updateStatusByOrderId(param.getOrderId(), ReserveStatus.CANCELED);
         return omsOrderReturnApply.getId();
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.chelvc.cloud.user.client.model.Scope;
+import com.chelvc.cloud.vehicle.client.constant.ReserveStatus;
 import com.chelvc.cloud.vehicle.client.dto.*;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
@@ -68,6 +69,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     private final UserReceiveAddressService userReceiveAddressService;
 
+    private final ReservationService reservationService;
+
     @Override
     public ConfirmOrderResultDTO generateConfirmOrder(OmsOrderModifyParam orderParam) {
         ConfirmOrderResultDTO result = new ConfirmOrderResultDTO();
@@ -890,6 +893,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         AssertUtils.available(status == 1, "该订单不可用");
         DatabaseContextHolder.transactional((Executor) () -> {
             orderHandleService.handleOrder(omsOrder);
+            this.reservationService.updateStatusByOrderId(orderId, ReserveStatus.COMPLETED);
         });
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/ReservationServiceImpl.java

@@ -149,9 +149,21 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
     }
     @Override
     public void updateReservationsStatus(Long id,ReserveStatus status){
-        Reservation reservation = AssertUtils.available(this.getById(id), "该预约单不存在");
-        reservation.setStatus(status);
-        this.updateById(reservation);
+        Reservation reservation = this.baseMapper.selectById(id);
+        if (null != reservation){
+            reservation.setStatus(status);
+            this.updateById(reservation);
+        }
+    }
+
+    @Override
+    public void updateStatusByOrderId(Long orderId, ReserveStatus status) {
+        Reservation reservation = this.lambdaQuery()
+                .eq(Reservation::getOrderId,orderId).one();
+        if (null != reservation){
+            reservation.setStatus(status);
+            this.updateById(reservation);
+        }
     }
     @Override
     public ReservationDTO getDetail(Long id){