121212

Service/Application.Web/Controllers/User/UserController.cs

@@ -55,9 +55,9 @@ public class UserController : ControllerBase
         var accInfo = await _accService.GetUserAccInfo(userId);
         object acc = new { accInfo.gold, accInfo.cowry, accInfo.teach, accInfo.renown };
 
-        var buff = await _attrService.GetUserStateData(userId,"ALL");
-        
-        object result = new { user, attr = attrInfo, exp, vigourInfo.vitality, acc,buff };
+        var buff = await _attrService.GetUserStateData(userId, "ALL");
+        var stock = await _attrService.GetUserStock(userId);
+        object result = new { user, attr = attrInfo, exp, vigourInfo.vitality, acc, buff, stock };
         return PoAction.Ok(result);
     }
 
@@ -175,7 +175,7 @@ public class UserController : ControllerBase
         var suit = await _equService.GetUserEquSuit(userInfo.userId);
         object result = new
         {
-            user, attr = new { attrInfo.lev }, acc, isOnline, onMapName, isFriend, isEnemy, team, equ,suit
+            user, attr = new { attrInfo.lev }, acc, isOnline, onMapName, isFriend, isEnemy, team, equ, suit
         };
         return PoAction.Ok(result);
     }