|
@@ -183,6 +183,8 @@ public class PayScoreServiceImpl implements PayScoreService {
|
|
|
order.setStatus(OrderStatus.COMPLETED.getCode());
|
|
order.setStatus(OrderStatus.COMPLETED.getCode());
|
|
|
order.setPayTime(LocalDateTime.now());
|
|
order.setPayTime(LocalDateTime.now());
|
|
|
order.setPayScoreFailReason(null);
|
|
order.setPayScoreFailReason(null);
|
|
|
|
|
+ // 同步支付状态到哈哈平台
|
|
|
|
|
+ orderService.notifyHahaOrderStatusChanged(order.getOrderNo());
|
|
|
log.info("[支付分服务] 完结并扣款成功 - orderId: {}, state: {}", orderId, state);
|
|
log.info("[支付分服务] 完结并扣款成功 - orderId: {}, state: {}", orderId, state);
|
|
|
} else if (PayScoreState.isPaying(state)) {
|
|
} else if (PayScoreState.isPaying(state)) {
|
|
|
log.warn("[支付分服务] 完结成功但用户待支付 - orderId: {}, state: {}", orderId, state);
|
|
log.warn("[支付分服务] 完结成功但用户待支付 - orderId: {}, state: {}", orderId, state);
|
|
@@ -344,6 +346,11 @@ public class PayScoreServiceImpl implements PayScoreService {
|
|
|
|
|
|
|
|
orderService.updateById(order);
|
|
orderService.updateById(order);
|
|
|
|
|
|
|
|
|
|
+ // 支付/退款状态变更时同步到哈哈平台
|
|
|
|
|
+ if ("PAYSCORE.USER_PAID".equals(eventType) || "PAYSCORE.REFUND_PAID".equals(eventType)) {
|
|
|
|
|
+ orderService.notifyHahaOrderStatusChanged(order.getOrderNo());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -385,6 +392,8 @@ public class PayScoreServiceImpl implements PayScoreService {
|
|
|
if (result.getTotalAmount() != null) {
|
|
if (result.getTotalAmount() != null) {
|
|
|
order.setTotalAmount(result.getTotalAmount());
|
|
order.setTotalAmount(result.getTotalAmount());
|
|
|
}
|
|
}
|
|
|
|
|
+ // 同步支付状态到哈哈平台
|
|
|
|
|
+ orderService.notifyHahaOrderStatusChanged(order.getOrderNo());
|
|
|
} else if (PayScoreState.isRevoked(newState)) {
|
|
} else if (PayScoreState.isRevoked(newState)) {
|
|
|
order.setStatus(OrderStatus.CANCELLED.getCode());
|
|
order.setStatus(OrderStatus.CANCELLED.getCode());
|
|
|
} else if (PayScoreState.isExpired(newState)) {
|
|
} else if (PayScoreState.isExpired(newState)) {
|