Feat: user storage pack

2020-01-14 10:32:54 +08:00
parent f3e78ec4ff
commit 5be7ec98c1
11 changed files with 148 additions and 7 deletions
--- a/pkg/serializer/user.go
+++ b/pkg/serializer/user.go
@@ -87,13 +87,14 @@ func BuildUserResponse(user model.User) Response {

 // BuildUserStorageResponse 序列化用户存储概况响应
 func BuildUserStorageResponse(user model.User) Response {
+	total := user.Group.MaxStorage + user.GetAvailablePackSize()
 	storageResp := storage{
 		Used:  user.Storage,
-		Free:  user.Group.MaxStorage - user.Storage,
-		Total: user.Group.MaxStorage,
+		Free:  total - user.Storage,
+		Total: total,
 	}

-	if user.Group.MaxStorage < user.Storage {
+	if total < user.Storage {
 		storageResp.Free = 0
 	}