|
|
|
@ -620,7 +620,7 @@ app.post('/api/user/upload', async (req, res) => { |
|
|
|
console.log('收到用户信息上传请求:', userData); |
|
|
|
|
|
|
|
// 如果用户信息中包含手机号,检查手机号是否已被其他用户使用
|
|
|
|
if (userData.phoneNumber && userData.phoneNumber !== '13800138000') { // 排除临时占位手机号
|
|
|
|
if (userData.phoneNumber) { |
|
|
|
const existingUserWithPhone = await User.findOne({ |
|
|
|
where: { |
|
|
|
phoneNumber: userData.phoneNumber, |
|
|
|
@ -654,10 +654,9 @@ app.post('/api/user/upload', async (req, res) => { |
|
|
|
); |
|
|
|
user = await User.findOne({ where: { openid: userData.openid } }); |
|
|
|
} else { |
|
|
|
// 创建新用户(使用临时手机号)
|
|
|
|
// 创建新用户
|
|
|
|
user = await User.create({ |
|
|
|
...userDataWithoutPhone, |
|
|
|
phoneNumber: '13800138000', // 临时占位
|
|
|
|
created_at: new Date(), |
|
|
|
updated_at: new Date() |
|
|
|
}); |
|
|
|
@ -877,14 +876,13 @@ app.post('/api/wechat/getOpenid', async (req, res) => { |
|
|
|
userId, |
|
|
|
session_key, |
|
|
|
nickName: '微信用户', // 临时占位,等待用户授权
|
|
|
|
phoneNumber: '13800138000', // 临时占位,等待用户授权
|
|
|
|
type: userType, // 使用客户端传入的类型或默认买家身份
|
|
|
|
created_at: new Date(), |
|
|
|
updated_at: new Date() |
|
|
|
}); |
|
|
|
|
|
|
|
// 为新创建的用户创建关联记录
|
|
|
|
const newUser = { userId, openid, nickName: '微信用户', phoneNumber: '13800138000' }; |
|
|
|
const newUser = { userId, openid, nickName: '微信用户' }; |
|
|
|
await createUserAssociations(newUser); |
|
|
|
} |
|
|
|
|
|
|
|
@ -2686,7 +2684,6 @@ app.post('/api/product/edit', async (req, res) => { |
|
|
|
openid: 'test_openid', |
|
|
|
userId: 'test_user_id', |
|
|
|
nickName: '测试用户', |
|
|
|
phoneNumber: '13800138000', |
|
|
|
type: 'seller' |
|
|
|
}); |
|
|
|
} catch (createError) { |
|
|
|
|