|
|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
@@ -1158,7 +1159,12 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
if (order.getReservationId() != null) {
|
|
|
UserReservation r = this.getById(order.getReservationId());
|
|
|
if (r != null) {
|
|
|
- vo.setMerchantCancelReason(r.getReason());
|
|
|
+ String reservationReason = r.getReason();
|
|
|
+ vo.setMerchantCancelReason(reservationReason);
|
|
|
+ // 与 merchantCancelReason 同源：订单表未落库退款原因时，用预约单原因展示（如商家取消）
|
|
|
+ if (StringUtils.isBlank(order.getRefundReason()) && StringUtils.isNotBlank(reservationReason)) {
|
|
|
+ order.setRefundReason(reservationReason);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return vo;
|
zhangchen