fix

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

@@ -166,21 +166,21 @@ public class SpotifyController {
 				.build());
 		if (order == null) {
 			spotifyOrderInfoDto.setStatus(SpotifyOrderInfoDto.Status.noPayment.name());
+			SpotifyUserUpgradeSubmitRecord upgradeSubmitRecord = beanSearcher.searchFirst(SpotifyUserUpgradeSubmitRecord.class, MapUtils.builder()
+					.field(SpotifyUserUpgradeSubmitRecord::getUserId, userIdList).op(Operator.InList)
+					.field(SpotifyUserUpgradeSubmitRecord::getRelationId, order.getRelationId())
+					.orderBy(SpotifyUserUpgradeSubmitRecord::getId).desc().build());
+			if (upgradeSubmitRecord == null) {
+				spotifyOrderInfoDto.setStatus(SpotifyOrderInfoDto.Status.notSubmitted.name());
+			} else {
+				spotifyOrderInfoDto.setAccount(upgradeSubmitRecord.getAccount());
+				spotifyOrderInfoDto.setPassword(upgradeSubmitRecord.getPassword());
+				spotifyOrderInfoDto.setEmail(upgradeSubmitRecord.getEmail());
+				spotifyOrderInfoDto.setStatus(upgradeSubmitRecord.getStatus().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())
-				.orderBy(SpotifyUserUpgradeSubmitRecord::getId).desc().build());
-		if (upgradeSubmitRecord == null) {
-			spotifyOrderInfoDto.setStatus(SpotifyOrderInfoDto.Status.notSubmitted.name());
-		} else {
-			spotifyOrderInfoDto.setAccount(upgradeSubmitRecord.getAccount());
-			spotifyOrderInfoDto.setPassword(upgradeSubmitRecord.getPassword());
-			spotifyOrderInfoDto.setEmail(upgradeSubmitRecord.getEmail());
-			spotifyOrderInfoDto.setStatus(upgradeSubmitRecord.getStatus().name());
-		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(spotifyOrderInfoDto);
 	}