加入商家取消原因

alien-entity/src/main/java/shop/alien/entity/store/vo/ReservationOrderListDto.java

@@ -40,4 +40,6 @@ public class ReservationOrderListDto {
     private Date createdTime;
     @ApiModelProperty(value = "核销码/券码")
     private String verificationCode;
+    @ApiModelProperty(value = "商家取消原因（user_reservation.reason，商家取消时有值）")
+    private String merchantCancelReason;
 }

alien-entity/src/main/resources/mapper/UserReservationOrderMapper.xml

@@ -14,6 +14,7 @@
         <result column="createdTime" property="createdTime"/>
         <result column="verificationCode" property="verificationCode"/>
         <result column="paymentStatus" property="paymentStatus"/>
+        <result column="merchantCancelReason" property="merchantCancelReason"/>
     </resultMap>
 
     <!-- 预订订单列表：店铺名称模糊搜索（限10字）、按状态筛选 -->
@@ -29,10 +30,12 @@
             o.reservation_id AS reservationId,
             o.deposit_amount AS depositAmount,
             o.created_time AS createdTime,
-            o.verification_code AS verificationCode
+            o.verification_code AS verificationCode,
+            r.reason AS merchantCancelReason
         FROM user_reservation_order o
         LEFT JOIN store_info s ON o.store_id = s.id AND s.delete_flag = 0
         LEFT JOIN store_img img ON img.store_id = s.id AND img.img_type = 1 AND img.delete_flag = 0
+        LEFT JOIN user_reservation r ON o.reservation_id = r.id AND r.delete_flag = 0
         WHERE o.delete_flag = 0
           AND o.user_id = #{userId}
         <if test="storeName != null and storeName != ''">

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

@@ -135,6 +135,7 @@ public class ReservationOrderListServiceImpl implements ReservationOrderListServ
             vo.setStatusText(buildStatusText(dto.getOrderStatus(), resForStatus));
             vo.setDepositAmount(dto.getDepositAmount());
             vo.setVerificationCode(dto.getVerificationCode());
+            vo.setMerchantCancelReason(dto.getMerchantCancelReason());
             vo.setCreatedTime(dto.getCreatedTime());
             vo.setCanContinuePay(false);
             vo.setCanCancelReservation(false);

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

@@ -59,6 +59,9 @@ public class ReservationOrderListVo {
     @ApiModelProperty(value = "核销码/券码")
     private String verificationCode;
 
+    @ApiModelProperty(value = "商家取消原因（statusText 为「商家取消」时有值）")
+    private String merchantCancelReason;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;