|
|
@@ -257,9 +257,10 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
}
|
|
|
Integer reservationId = one.getReservationId();
|
|
|
|
|
|
- // 当订单为未支付时,订单状态变为已关闭
|
|
|
+ // 当订单为未支付且为收费订单时,订单状态变为已关闭(5);否则为已取消(4)
|
|
|
int orderStatus = 4;
|
|
|
- if (one.getPaymentStatus() != null && one.getPaymentStatus() == 0) {
|
|
|
+ if (one.getPaymentStatus() != null && one.getPaymentStatus() == 0
|
|
|
+ && one.getOrderCostType() != null && one.getOrderCostType() == 1) {
|
|
|
orderStatus = 5;
|
|
|
}
|
|
|
|