Commit f981e55e authored by zhangfeng's avatar zhangfeng

Merge branch 'refs/heads/feature_member_score' into dev

parents 7156a0c3 e9f3e5a1
...@@ -53,13 +53,14 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy { ...@@ -53,13 +53,14 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
try { try {
order = orderApi.getOrder(orderId, message.getOrderNo()); order = orderApi.getOrder(orderId, message.getOrderNo());
} catch (Exception e) { } 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; return;
} }
if (Objects.isNull(order)) { 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; return;
} }
orderId = order.getOrderId();
// 订单状态应为起运 // 订单状态应为起运
if (!Objects.equals(order.getStatus(), OrderStatusApiEnum.IN_SHIPPING.getValue())) { if (!Objects.equals(order.getStatus(), OrderStatusApiEnum.IN_SHIPPING.getValue())) {
return; 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