Commit e9f3e5a1 authored by zhangfeng's avatar zhangfeng

Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score

parents 47895842 80a057c9
......@@ -53,13 +53,14 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
try {
order = orderApi.getOrder(orderId, message.getOrderNo());
} catch (Exception e) {
log.error("Order in shipping listener: Get order error,orderId:{}", orderId, e);
log.error("Order in shipping listener: Get order error,orderId:{}", orderId == null ? message.getOrderNo() : orderId, e);
return;
}
if (Objects.isNull(order)) {
log.error("Order in shipping listener: The order does not exist,orderId:{}", orderId);
log.error("Order in shipping listener: The order does not exist,orderId:{}", orderId == null ? message.getOrderNo() : orderId);
return;
}
orderId = order.getOrderId();
// 订单状态应为起运
if (!Objects.equals(order.getStatus(), OrderStatusApiEnum.IN_SHIPPING.getValue())) {
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment