fix pc端同步车票

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -1,6 +1,8 @@
 package com.cyksj.service.relation.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.market.task.UserBindPhoneMapper;
@@ -36,15 +38,29 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	@Override
 	public List<RenewalView> getMyTicket(long userId) {
+		User u = userMapper.selectById(userId);
+		Boolean isPcUser = false;
+		if (StrUtil.isNotBlank(u.getLoginPhone())) {
+			isPcUser = true;
+		}
 		//是否绑定过手机号
-		UserBindPhone userBindPhone = userBindPhoneMapper.selectOne(Wrappers.lambdaQuery(UserBindPhone.class)
-				.eq(UserBindPhone::getUserId, userId).last("limit 1"));
+		LambdaQueryWrapper<UserBindPhone> wrapper = Wrappers.lambdaQuery(UserBindPhone.class).last("limit 1");
+		if (isPcUser) {
+			wrapper.eq(UserBindPhone::getPhone, u.getLoginPhone());
+		} else {
+			wrapper.eq(UserBindPhone::getUserId, userId);
+		}
+		UserBindPhone userBindPhone = userBindPhoneMapper.selectOne(wrapper);
 		Long otherUserId = 0l;
 		if (userBindPhone != null) {
-			User user = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
-					.eq(User::getLoginPhone, userBindPhone.getPhone()).last("limit 1"));
-			if (user != null) {
-				otherUserId = user.getId();
+			if (isPcUser) {
+				otherUserId = userBindPhone.getUserId();
+			}else {
+				User user = userMapper.selectOne(Wrappers.lambdaQuery(User.class)
+						.eq(User::getLoginPhone, userBindPhone.getPhone()).last("limit 1"));
+				if (user != null) {
+					otherUserId = user.getId();
+				}
 			}
 		}
 		List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, MapUtils.builder()