Merge branch 'vip_users'

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/views/YHLXUserDetailView.java
#	netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpUserServiceImpl.java

netflix-dao/src/main/java/com/cyksj/mapper/UserIdentityMapper.java

@@ -0,0 +1,14 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserIdentity;
+
+/**
+ * 项目名: netflix-job
+ * 文件名: UserIdentityMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/12/9 16:23
+ */
+public interface UserIdentityMapper extends BaseMapper<UserIdentity> {
+
+}

netflix-dao/src/main/java/com/cyksj/model/entity/UserIdentity.java

@@ -0,0 +1,33 @@
+package com.cyksj.model.entity;
+
+import com.cyksj.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: netflix-job
+ * 文件名: UserIdentity
+ * 创建者: JavaZou
+ * 创建时间:2024/12/9 16:21
+ */
+@Getter
+@Setter
+public class UserIdentity extends BaseEntity {
+	private Long userId;
+
+	/**
+	 * 标识
+	 */
+	private Tag tag;
+
+	@Getter
+	public enum Tag{
+		VIP("消费Vip"),
+		;
+		String msg;
+
+		Tag(String msg) {
+			this.msg = msg;
+		}
+	}
+}

netflix-dao/src/main/java/com/cyksj/model/views/YHLXUserDetailView.java

@@ -61,4 +61,10 @@ public class YHLXUserDetailView {
 	 */
 	@DbIgnore
 	private Boolean isSpotifySelfService;
+
+	/**
+	 * 是否是银河VIP用户
+	 */
+	@DbIgnore
+	private Boolean isVip;
 }

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpUserServiceImpl.java

@@ -8,6 +8,7 @@ import com.cyksj.config.corp.WeChatCorpFactory;
 import com.cyksj.mapper.AddressMapper;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.SpotifyUserSelfServiceRecordMapper;
+import com.cyksj.mapper.UserIdentityMapper;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.corp.CorpUserAuthMapper;
 import com.cyksj.mapper.corp.CorpUserMapper;
@@ -62,6 +63,8 @@ public class CorpUserServiceImpl implements CorpUserService {
 
 	private final SpotifyUserSelfServiceRecordMapper spotifyUserSelfServiceRecordMapper;
 
+	private final UserIdentityMapper userIdentityMapper;
+
 	@Override
 	public YHLXUserDetailView getUserDetailView(String externalUserid, String corpId) throws Exception {
 		CorpUser corpUser = getExternalUserId(corpId, externalUserid);
@@ -115,6 +118,11 @@ public class CorpUserServiceImpl implements CorpUserService {
 		Integer count = spotifyUserSelfServiceRecordMapper.selectCount(Wrappers.lambdaQuery(SpotifyUserSelfServiceRecord.class)
 				.in(SpotifyUserSelfServiceRecord::getUserId, userIdList));
 		view.setIsSpotifySelfService(count > 0);
+
+		Integer count2 = userIdentityMapper.selectCount(Wrappers.lambdaQuery(UserIdentity.class)
+				.in(UserIdentity::getUserId, userIdList)
+				.eq(UserIdentity::getTag, UserIdentity.Tag.VIP));
+		view.setIsVip(count2 > 0);
 		return view;
 	}