fix

netflix-dao/src/main/java/com/cyksj/model/dto/SpotifyOrderInfoDto.java

@@ -0,0 +1,38 @@
+package com.cyksj.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: SpotifyOrderInfoDto
+ * 创建者: JavaZou
+ * 创建时间:2024/12/4 17:19
+ */
+@Getter
+@Setter
+public class SpotifyOrderInfoDto {
+	private Long relationId;
+
+	private String status;
+
+	private String account;
+
+	private String password;
+
+	private String email;
+
+	@Getter
+	public enum Status{
+		noPayment("未支付"),
+		notSubmitted("未提交"),
+		waiting("待处理"),
+		fail("失败"),
+		success("成功");
+		String msg;
+
+		Status(String msg) {
+			this.msg = msg;
+		}
+	}
+}

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

@@ -5,6 +5,7 @@ import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.dto.AliPayParams;
+import com.cyksj.model.dto.SpotifyOrderInfoDto;
 import com.cyksj.model.entity.SpotifyUserSelfServiceRecord;
 import com.cyksj.model.entity.SpotifyUserUpgradeOrder;
 import com.cyksj.model.entity.SpotifyUserUpgradeSubmitRecord;
@@ -154,15 +155,33 @@ public class SpotifyController {
 	/**
 	 * 查看提交账号信息
 	 */
-	@GetMapping("/upgrade/submit/account/{relationId}")
-	public Result<SpotifyUserUpgradeSubmitRecord> getUpgradeSubmitAccount(@PathVariable Long relationId) {
+	@GetMapping("/upgrade/submit/account")
+	public Result<SpotifyOrderInfoDto> getUpgradeSubmitAccount() {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		SpotifyOrderInfoDto spotifyOrderInfoDto = new SpotifyOrderInfoDto();
+		SpotifyUserUpgradeOrder order = beanSearcher.searchFirst(SpotifyUserUpgradeOrder.class, MapUtils.builder()
+				.field(SpotifyUserUpgradeOrder::getUserId, userIdList).op(Operator.InList)
+				.field(SpotifyUserUpgradeOrder::getStatus, SpotifyUserUpgradeOrder.Status.hasPayment.name())
+				.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, relationId)
+				.field(SpotifyUserUpgradeSubmitRecord::getRelationId, order.getRelationId())
 				.orderBy(SpotifyUserUpgradeSubmitRecord::getId).desc().build());
-		return GatewayResponse.SUCCESS.newBuilder().toResult(upgradeSubmitRecord);
+		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);
 	}
 
 	/**