Merge branch 'holiday-price' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
 import com.github.wxiaoqi.security.admin.vo.InviteMemberVo;
@@ -360,5 +361,14 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
           List<AppUserRelation> appUserRelationList = mapper.selectByUserIds(userIds);
         return appUserRelationList==null?Collections.EMPTY_LIST:appUserRelationList;
     }
+
+    public void initParentId(AppUserDTO userDTO, Integer userid) {
+        AppUserRelation relation = getRelationByIdUserIdAndTime(userid);
+        Integer parentId=0;
+        if (relation!=null){
+            parentId=relation.getParentId();
+        }
+        userDTO.setParentId(parentId);
+    }
 }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -170,12 +170,7 @@ public class AppUserController extends CommonBaseController{
         if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
-        AppUserRelation relation=relationBiz.getRelationByIdUserIdAndTime(userid);
-        Integer parentId=0;
-        if (relation!=null){
-            parentId=relation.getParentId();
-        }
-        userDTO.setParentId(parentId);
+        relationBiz.initParentId(userDTO, userid);
         List<AppUserAlipay> appUserAlipays = appUserAlipayBiz.getByUserId(request);
         long count = appUserAlipays.stream().filter(appUserAlipay -> appUserAlipay.getType() == 1).count();
         userDTO.setIsBindAliPay(count>0);
@@ -187,7 +182,6 @@ public class AppUserController extends CommonBaseController{
         return ObjectRestResponse.succ(userDTO);
     }
 
-
     @ApiOperation("获取用户收益")
     @GetMapping("/profit")
     public ObjectRestResponse profit() throws Exception{

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -48,6 +48,9 @@ public class PublicController {
     @Autowired
     AppUserPositionBiz positionBiz;
 
+    @Autowired
+    private AppUserRelationBiz relationBiz;
+
     @RequestMapping(value = "/userinfo-by-token", method = RequestMethod.GET)
     public @ResponseBody
     ObjectRestResponse userinfoByToken(String token) throws Exception {
@@ -118,7 +121,11 @@ public class PublicController {
         if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
+
         userDTO.setId(id);
+
+        //设置上级
+        relationBiz.initParentId(userDTO, userid);
         return userDTO;
     }