新增参数

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

@@ -40,6 +40,10 @@ public class ReservationOrderListDto {
     private Date createdTime;
     @ApiModelProperty(value = "核销码/券码")
     private String verificationCode;
+    @ApiModelProperty(value = "商户订单号（out_trade_no）")
+    private String outTradeNo;
+    @ApiModelProperty(value = "支付方式/类型，如 wechatPay、alipay")
+    private String payType;
     @ApiModelProperty(value = "商家取消原因（user_reservation.reason，商家取消时有值）")
     private String merchantCancelReason;
     @ApiModelProperty(value = "经营板块ID（store_info.business_section）")

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

@@ -15,6 +15,8 @@
         <result column="createdTime" property="createdTime"/>
         <result column="verificationCode" property="verificationCode"/>
         <result column="paymentStatus" property="paymentStatus"/>
+        <result column="outTradeNo" property="outTradeNo"/>
+        <result column="payType" property="payType"/>
         <result column="merchantCancelReason" property="merchantCancelReason"/>
     </resultMap>
 
@@ -33,6 +35,8 @@
             o.deposit_amount AS depositAmount,
             o.created_time AS createdTime,
             o.verification_code AS verificationCode,
+            o.out_trade_no AS outTradeNo,
+            o.payment_method AS payType,
             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

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

@@ -136,6 +136,8 @@ public class ReservationOrderListServiceImpl implements ReservationOrderListServ
             vo.setStatusText(buildStatusText(dto.getOrderStatus(), resForStatus));
             vo.setDepositAmount(dto.getDepositAmount());
             vo.setVerificationCode(dto.getVerificationCode());
+            vo.setOutTradeNo(dto.getOutTradeNo());
+            vo.setPayType(dto.getPayType());
             vo.setMerchantCancelReason(dto.getMerchantCancelReason());
             vo.setCreatedTime(dto.getCreatedTime());
             vo.setCanContinuePay(false);

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

@@ -62,6 +62,12 @@ public class ReservationOrderListVo {
     @ApiModelProperty(value = "核销码/券码")
     private String verificationCode;
 
+    @ApiModelProperty(value = "商户订单号（传给支付宝/微信，用于查单、退款等）")
+    private String outTradeNo;
+
+    @ApiModelProperty(value = "支付方式/类型，如 wechatPay、alipay")
+    private String payType;
+
     @ApiModelProperty(value = "商家取消原因（statusText 为「商家取消」时有值）")
     private String merchantCancelReason;