|
|
@@ -209,8 +209,16 @@ public class StoreReservationServiceImpl extends ServiceImpl<StoreReservationMap
|
|
|
|
|
|
log.info("商家端取消预约成功(付费订单),reservationId={}, orderId={}", reservationId, order.getId());
|
|
|
|
|
|
- // 发送短信通知
|
|
|
+ // 先发送取消通知和短信
|
|
|
sendCancelReservationSms(reservation, cancelReason);
|
|
|
+
|
|
|
+ // 付费订单:再发送订金退款通知和短信
|
|
|
+ try {
|
|
|
+ sendDepositRefundSmsAndNotice(reservation, order);
|
|
|
+ } catch (Exception smsEx) {
|
|
|
+ log.error("商家取消预约后发送退款通知/短信失败,不影响取消结果,reservationId={}", reservationId, smsEx);
|
|
|
+ }
|
|
|
+
|
|
|
return true;
|
|
|
} catch (Exception e) {
|
|
|
log.error("付费订单取消退款失败,reservationId={}, orderId={}, error={}",
|