加入商家取消原因

alien-store/src/main/java/shop/alien/store/service/impl/UserReservationServiceImpl.java

@@ -1024,6 +1024,12 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
             copyPageVoToDetailVo(pageVo, vo);
         }
         vo.setRefundType(order.getRefundType());
+        if (order.getReservationId() != null) {
+            UserReservation r = this.getById(order.getReservationId());
+            if (r != null) {
+                vo.setMerchantCancelReason(r.getReason());
+            }
+        }
         return vo;
     }
 

alien-store/src/main/java/shop/alien/store/vo/ReservationOrderDetailVo.java

@@ -145,4 +145,7 @@ public class ReservationOrderDetailVo {
 
     @ApiModelProperty(value = "退款类型（与 user_reservation_order.refund_type 一致）")
     private Integer refundType;
+
+    @ApiModelProperty(value = "商家取消原因（user_reservation.reason，商家取消时有值）")
+    private String merchantCancelReason;
 }