..

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/UserLogicImpl.java

@@ -2,6 +2,7 @@ package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.site.common.annotation.PointChange;
 import cn.iselab.mooctest.site.common.constant.Constants;
 import cn.iselab.mooctest.site.configure.realm.DefaultUsernamepasswordToken;
@@ -11,6 +12,7 @@ import cn.iselab.mooctest.site.models.ManagerProperty;
 import cn.iselab.mooctest.site.models.Role;
 import cn.iselab.mooctest.site.models.User;
 import cn.iselab.mooctest.site.models.User2Role;
+import cn.iselab.mooctest.site.rpc.user.IntegralService;
 import cn.iselab.mooctest.site.service.*;
 import cn.iselab.mooctest.site.util.data.EncryptionUtil;
 import cn.iselab.mooctest.site.web.data.ManagerPropertyVO;
@@ -108,6 +110,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Autowired
     private MenuVOWrapper menuVOWrapper;
 
+    @Autowired
+    private IntegralService integralService;
+
     private UserDTOForMT transfer(UserVO userVO) {
         return Converter.convert(UserDTOForMT.class, userVO);
     }
@@ -744,6 +749,10 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         userVO.setMenuVOs(menuVOs);
         userVO.setOpenId(openId2UserIdService.findOpenIdByUserId(userVO.getId()));
         userVO.setPassword("");
+        UserIntegralDTO integralDTO=integralService.getUserIntegral(userVO.getId());
+        if (integralDTO!=null) {
+            userVO.setIntegral(integralDTO.getTotal());
+        }
 
         if (managerPropertyService.getManagerPropertyByUserId(userVO.getId()) != null) {
             ManagerProperty managerProperty = managerPropertyService.getManagerPropertyByUserId(userVO.getId());