fix

netflix-dao/src/main/java/com/cyksj/model/request/SpotifyUpgradeInfoReq.java

@@ -14,6 +14,8 @@ import lombok.Setter;
 public class SpotifyUpgradeInfoReq {
 	private Long orderId;
 
+	private Long relationId;
+
 	private Long userId;
 
 	private String account;

netflix-service/src/main/java/com/cyksj/service/spotify/impl/SpotifyUserUpgradeOrderServiceImpl.java

@@ -94,8 +94,8 @@ public class SpotifyUserUpgradeOrderServiceImpl implements SpotifyUserUpgradeOrd
 
 	@Override
 	public void submitUpgradeInfo(SpotifyUpgradeInfoReq spotifyUpgradeInfoReq) {
-		Long orderId = spotifyUpgradeInfoReq.getOrderId();
-		Assert.notNull(orderId, "订单不存在");
+		Long relationId = spotifyUpgradeInfoReq.getRelationId();
+		Assert.notNull(relationId, "参数错误");
 		String account = spotifyUpgradeInfoReq.getAccount();
 		if (StrUtil.isEmpty(account) || account.length() > 64) {
 			throw BusinessRuntimeException.getInstance("请输入正确的账号信息");
@@ -111,12 +111,13 @@ public class SpotifyUserUpgradeOrderServiceImpl implements SpotifyUserUpgradeOrd
 		Long userId = spotifyUpgradeInfoReq.getUserId();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		SpotifyUserUpgradeOrder order = spotifyUserUpgradeOrderMapper.selectOne(Wrappers.lambdaQuery(SpotifyUserUpgradeOrder.class)
-				.eq(SpotifyUserUpgradeOrder::getId, orderId)
+				.eq(SpotifyUserUpgradeOrder::getRelationId, relationId)
 				.in(SpotifyUserUpgradeOrder::getUserId, userIdList)
 				.eq(SpotifyUserUpgradeOrder::getStatus, SpotifyUserUpgradeOrder.Status.hasPayment));
 		if (order == null) {
 			throw BusinessRuntimeException.getInstance("订单不存在");
 		}
+		Long orderId = order.getId();
 		Integer selectCount = spotifyUserUpgradeSubmitRecordMapper.selectCount(Wrappers.lambdaQuery(SpotifyUserUpgradeSubmitRecord.class)
 				.eq(SpotifyUserUpgradeSubmitRecord::getOrderId, orderId));
 		if (selectCount > 0) {