|
@@ -35,6 +35,7 @@ import com.qs.mp.common.enums.TicketTypeEnum;
|
|
import com.qs.mp.common.enums.UserCouponStatusEnum;
|
|
import com.qs.mp.common.enums.UserCouponStatusEnum;
|
|
import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
|
|
import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
|
|
import com.qs.mp.common.exception.ServiceException;
|
|
import com.qs.mp.common.exception.ServiceException;
|
|
|
|
+import com.qs.mp.common.utils.DateUtils;
|
|
import com.qs.mp.common.utils.LogUtil;
|
|
import com.qs.mp.common.utils.LogUtil;
|
|
import com.qs.mp.common.utils.RSAUtil;
|
|
import com.qs.mp.common.utils.RSAUtil;
|
|
import com.qs.mp.common.utils.StringUtils;
|
|
import com.qs.mp.common.utils.StringUtils;
|
|
@@ -386,6 +387,7 @@ public class UserTicketOrderServiceImpl extends
|
|
JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
|
|
JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
|
|
throw new ServiceException("支付回调用户购票订单处理,订单状态异常,不是待支付。orderId:" + payOrder.getBizId());
|
|
throw new ServiceException("支付回调用户购票订单处理,订单状态异常,不是待支付。orderId:" + payOrder.getBizId());
|
|
}
|
|
}
|
|
|
|
+ ticketOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
|
|
return processTicketOrder(ticketOrder);
|
|
return processTicketOrder(ticketOrder);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -420,7 +422,7 @@ public class UserTicketOrderServiceImpl extends
|
|
boolean updateRst = update(
|
|
boolean updateRst = update(
|
|
new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
|
|
new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
|
|
UserTicketOrderStatusEnum.FINISHED)
|
|
UserTicketOrderStatusEnum.FINISHED)
|
|
- .set(UserTicketOrder::getPayTime, new Date())
|
|
|
|
|
|
+ .set(UserTicketOrder::getPayTime, ticketOrder.getPayTime())
|
|
.eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
|
|
.eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
|
|
.eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
.eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
|
|
Assert.isTrue(updateRst, "支付回调用户购票订单处理,更新订单状态失败,orderId:" + ticketOrder.getOrderId());
|
|
Assert.isTrue(updateRst, "支付回调用户购票订单处理,更新订单状态失败,orderId:" + ticketOrder.getOrderId());
|