From 58d9f460b2f8c34430285115e2557d18333c5cab Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期三, 08 十月 2025 14:16:55 +0800
Subject: [PATCH] feat: 修复Player实体phone字段数据冗余问题并优化小程序报名逻辑
---
backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerService.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerService.java b/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerService.java
index b40491c..c050054 100644
--- a/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerService.java
+++ b/backend/src/main/java/com/rongyichuang/player/service/ActivityPlayerService.java
@@ -173,16 +173,21 @@
/**
* 鏌ユ壘鎴栧垱寤洪�夋墜璁板綍
+ * 閫昏緫锛�
+ * 1. 鍏堜繚瀛楿ser锛堟牴鎹畃hone鏌ヨ锛屽瓨鍦ㄥ垯鏇存柊锛屽惁鍒欐柊澧烇級
+ * 2. 鍐嶄繚瀛楶layer锛堟牴鎹畊serId鏌ヨ锛屽瓨鍦ㄥ垯鏇存柊锛屽惁鍒欐柊澧烇級
*/
private Player findOrCreatePlayer(ActivityRegistrationInput input) {
try {
- // 鍏堟牴鎹墜鏈哄彿鏌ユ壘鐜版湁閫夋墜
- String phone = input.getPlayerInfo().getPhone();
- Optional<Player> existingPlayerOpt = playerRepository.findByPhone(phone);
+ // 1. 鍏堝垱寤烘垨鏇存柊鐢ㄦ埛璁板綍
+ User user = createOrUpdateUser(input);
+
+ // 2. 鏍规嵁userId鏌ユ壘鐜版湁閫夋墜
+ Optional<Player> existingPlayerOpt = playerRepository.findByUserId(user.getId());
if (existingPlayerOpt.isPresent()) {
+ // 閫夋墜瀛樺湪锛屾洿鏂伴�夋墜淇℃伅
Player existingPlayer = existingPlayerOpt.get();
- // 鏇存柊閫夋墜淇℃伅
existingPlayer.setName(input.getPlayerInfo().getName());
if (input.getPlayerInfo().getGender() != null) {
existingPlayer.setGender(input.getPlayerInfo().getGender());
@@ -197,31 +202,28 @@
existingPlayer.setDescription(input.getPlayerInfo().getDescription());
}
- // 鏇存柊鍏宠仈鐨勭敤鎴蜂俊鎭紙濡傛灉瀛樺湪锛�
- updateUserInfo(existingPlayer, input);
-
// BaseEntity浼氳嚜鍔ㄨ缃畊pdateTime
- return playerRepository.save(existingPlayer);
+ Player savedPlayer = playerRepository.save(existingPlayer);
+ log.info("鏇存柊鐜版湁閫夋墜鎴愬姛锛孖D: {}, 濮撳悕: {}, 鐢ㄦ埛ID: {}", savedPlayer.getId(), savedPlayer.getName(), user.getId());
+ return savedPlayer;
}
- // 鍒涘缓鏂伴�夋墜
+ // 閫夋墜涓嶅瓨鍦紝鍒涘缓鏂伴�夋墜
Player newPlayer = new Player();
newPlayer.setName(input.getPlayerInfo().getName());
- newPlayer.setPhone(input.getPlayerInfo().getPhone());
+ // 涓嶅啀璁剧疆phone瀛楁锛宲hone淇℃伅缁熶竴瀛樺偍鍦║ser瀹炰綋涓�
+ // newPlayer.setPhone(input.getPlayerInfo().getPhone()); // 宸插簾寮�
newPlayer.setGender(input.getPlayerInfo().getGender());
newPlayer.setEducation(input.getPlayerInfo().getEducation());
newPlayer.setIntroduction(input.getPlayerInfo().getIntroduction());
newPlayer.setDescription(input.getPlayerInfo().getDescription());
newPlayer.setRoleId(1L); // 榛樿瑙掕壊ID涓�1锛堝鍛樿鑹诧級
newPlayer.setState(1); // 1琛ㄧず鏈夋晥鐘舵��
-
- // 鍒涘缓鎴栧叧鑱旂敤鎴疯褰�
- User user = createOrUpdateUser(input);
newPlayer.setUserId(user.getId());
// BaseEntity浼氳嚜鍔ㄨ缃甤reateTime鍜寀pdateTime
Player savedPlayer = playerRepository.save(newPlayer);
- log.info("鏂伴�夋墜鍒涘缓鎴愬姛锛孖D: {}, 濮撳悕: {}", savedPlayer.getId(), savedPlayer.getName());
+ log.info("鏂伴�夋墜鍒涘缓鎴愬姛锛孖D: {}, 濮撳悕: {}, 鐢ㄦ埛ID: {}", savedPlayer.getId(), savedPlayer.getName(), user.getId());
return savedPlayer;
} catch (Exception e) {
--
Gitblit v1.8.0