获客日期+登录父用户(未测)

ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java

@@ -43,7 +43,7 @@ public class BallcatOAuth2TokenCustomizer implements OAuth2TokenCustomizer<OAuth
 	}
 
 	private static HashMap<String, Object> getUserInfoMap(User user) {
-		HashMap<String, Object> userInfo = new HashMap<>(6);
+		HashMap<String, Object> userInfo = new HashMap<>(12);
 		userInfo.put(UserInfoFiledNameConstants.USER_ID, user.getUserId());
 		userInfo.put(UserInfoFiledNameConstants.TYPE, user.getType());
 		userInfo.put(UserInfoFiledNameConstants.SALESMAN_TYPE, user.getSalesmanType());
@@ -55,6 +55,7 @@ public class BallcatOAuth2TokenCustomizer implements OAuth2TokenCustomizer<OAuth
 		userInfo.put(UserInfoFiledNameConstants.GENDER, user.getGender());
 		userInfo.put(UserInfoFiledNameConstants.PHONE_NUMBER, user.getPhoneNumber());
 		userInfo.put(UserInfoFiledNameConstants.STATUS, user.getStatus());
+		userInfo.put(UserInfoFiledNameConstants.WHICH_USER_ID, user.getWhichUserId());
 		return userInfo;
 	}
 

ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserInfoFiledNameConstants.java

@@ -63,4 +63,9 @@ public final class UserInfoFiledNameConstants {
 	 */
 	public static final String STATUS = "status";
 
+	/**
+	 * 父用户ID
+	 */
+	public static final String WHICH_USER_ID = "whichUserId";
+
 }

ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java

@@ -266,7 +266,10 @@ public class BallcatRemoteOpaqueTokenIntrospector implements OpaqueTokenIntrospe
 		if (userIdObject != null) {
 			builder.userId(Long.parseLong(userIdObject.toString()));
 		}
-
+		Object whichUserIdObj = info.get(UserInfoFiledNameConstants.WHICH_USER_ID);
+		if (whichUserIdObj != null) {
+			builder.whichUserId(Long.parseLong(whichUserIdObj.toString()));
+		}
 		Object organizationIdObject = info.get(UserInfoFiledNameConstants.ORGANIZATION_ID);
 		if (organizationIdObject != null) {
 			builder.organizationId(Long.parseLong(organizationIdObject.toString()));

ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/BallcatOAuth2TokenResponseEnhancer.java

@@ -70,6 +70,7 @@ public class BallcatOAuth2TokenResponseEnhancer implements OAuth2TokenResponseEn
 		sysUserInfo.setEmail(user.getEmail());
 		sysUserInfo.setGender(user.getGender());
 		sysUserInfo.setSalesmanType(user.getSalesmanType());
+		sysUserInfo.setWhichUserId(user.getWhichUserId());
 		return sysUserInfo;
 	}
 

ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserInfo.java

@@ -78,5 +78,9 @@ public class SysUserInfo implements Serializable {
 	@Schema(title = "业务员类型")
 	private Integer salesmanType;
 
-
+	/**
+	 * 创建者(父ID)
+	 */
+	@Schema(title = "创建者(父ID)")
+	private Long whichUserId;
 }

admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java

@@ -11,6 +11,7 @@ import lombok.Setter;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -36,6 +37,10 @@ public class CustomStoreEntity extends BaseEntity {
 	@NotNull(message = "门店名称不能为空", groups = { CreateGroup.class })
 	private String storeName;
 
+	@Schema(title = "预约日期")
+	@NotNull(message = "预约日期不能为空", groups = { CreateGroup.class })
+	private LocalDateTime reservationDate;
+
 	@Schema(title = "预约时间")
 	@NotNull(message = "预约时间不能为空", groups = { CreateGroup.class })
 	private String reservationTime;

admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java

@@ -20,6 +20,9 @@ public class CustomStoreVO {
 	@Schema(title = "门店名称")
 	private String storeName;
 
+	@Schema(title = "预约日期")
+	private LocalDateTime reservationDate;
+
 	@Schema(title = "预约时间")
 	private String reservationTime;
 }