zoujiajian 1 rok temu
rodzic
commit
ac5ac4c028

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/spotify/SpotifyController.java

@@ -166,6 +166,8 @@ public class SpotifyController {
 				.build());
 		if (order == null) {
 			spotifyOrderInfoDto.setStatus(SpotifyOrderInfoDto.Status.noPayment.name());
+		} else {
+			spotifyOrderInfoDto.setRelationId(order.getRelationId());
 			SpotifyUserUpgradeSubmitRecord upgradeSubmitRecord = beanSearcher.searchFirst(SpotifyUserUpgradeSubmitRecord.class, MapUtils.builder()
 					.field(SpotifyUserUpgradeSubmitRecord::getUserId, userIdList).op(Operator.InList)
 					.field(SpotifyUserUpgradeSubmitRecord::getRelationId, order.getRelationId())
@@ -178,8 +180,6 @@ public class SpotifyController {
 				spotifyOrderInfoDto.setEmail(upgradeSubmitRecord.getEmail());
 				spotifyOrderInfoDto.setStatus(upgradeSubmitRecord.getStatus().name());
 			}
-		} else {
-			spotifyOrderInfoDto.setRelationId(order.getRelationId());
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(spotifyOrderInfoDto);
 	}