新增字段修改

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

@@ -48,4 +48,6 @@ public class ReservationOrderListDto {
     private String merchantCancelReason;
     @ApiModelProperty(value = "经营板块ID（store_info.business_section）")
     private Integer businessSection;
+    @ApiModelProperty(value = "订单费用类型 0-免费，1-收费")
+    private Integer orderCostType;
 }

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

@@ -18,6 +18,7 @@
         <result column="outTradeNo" property="outTradeNo"/>
         <result column="payType" property="payType"/>
         <result column="merchantCancelReason" property="merchantCancelReason"/>
+        <result column="orderCostType" property="orderCostType"/>
     </resultMap>
 
     <!-- 预订订单列表：店铺名称模糊搜索（限10字）、按状态筛选 -->
@@ -37,7 +38,8 @@
             o.verification_code AS verificationCode,
             o.out_trade_no AS outTradeNo,
             o.payment_method AS payType,
-            r.reason AS merchantCancelReason
+            r.reason AS merchantCancelReason,
+            o.order_cost_type AS orderCostType
         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

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

@@ -146,7 +146,7 @@ public class ReservationOrderListServiceImpl implements ReservationOrderListServ
             vo.setCanViewVoucher(false);
             vo.setCanDelete(false);
             vo.setCanBookAgain(false);
-
+            vo.setOrderCostType(dto.getOrderCostType());
             Integer status = dto.getOrderStatus();
             if (status != null) {
                 vo.setCanContinuePay(ORDER_STATUS_UNPAID == status);

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

@@ -93,4 +93,7 @@ public class ReservationOrderListVo {
 
     @ApiModelProperty(value = "是否显示「再次预订」")
     private Boolean canBookAgain;
+
+    @ApiModelProperty(value = "订单费用类型 0-免费，1-收费")
+    private Integer orderCostType;
 }