Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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

@@ -163,7 +163,6 @@ public class AppUserController extends CommonBaseController{
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
                     userDTO.setBigIcon(memberLevel.getBigIcon());
-                    userDTO.setItemImg(memberLevel.getItemImg());
                 }
             }
         }
@@ -171,7 +170,20 @@ 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);
+        List<AppUserAlipay> appUserAlipays = appUserAlipayBiz.getByUserId(request);
+        long count = appUserAlipays.stream().filter(appUserAlipay -> appUserAlipay.getType() == 1).count();
+        userDTO.setIsBindAliPay(count>0);
         userDTO.setId(id);
+        userDTO.setAliPayNickName(userDTO.getIsBindAliPay()?appUserAlipays.get(0).getNickname():"");
+        AppUserLogin appUserLogin = appUserLoginBiz.selectById(userid);
+        userDTO.setIsBindWx(StringUtils.isNotEmpty(appUserLogin.getWxOpenid()));
+        userDTO.setIsBindQQ(StringUtils.isNotEmpty(appUserLogin.getOpenid()));
         return ObjectRestResponse.succ(userDTO);
     }