Merge remote-tracking branch 'origin/dev' into dev

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

@@ -219,7 +219,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public void deleteAppUserById(Integer id) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setId(id);
-        appUserLogin.setIsdel(0);
+        appUserLogin.setIsdel(1);
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 

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

@@ -155,12 +155,12 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     public  void upRelationTemp(Integer pid,Integer userid){
 
         AppUserRelationTemp relationTemp=new AppUserRelationTemp();
-        relationTemp.setUserId(pid);
         relationTemp.setTempId(userid);
         relationTemp.setIsDel(0);
         relationTemp.setType(1);
         AppUserRelationTemp relationTemp1= relationTempBiz.selectOne(relationTemp);
         if(relationTemp1==null){
+            relationTemp.setUserId(pid);
             relationTempBiz.insertSelective(relationTemp);
         }
 

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

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.WalletCathSumDto;
 import com.github.wxiaoqi.security.admin.dto.WalletFindDTO;
 import com.github.wxiaoqi.security.admin.dto.WalletListDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
-import com.github.wxiaoqi.security.admin.entity.MyWallet;
-import com.github.wxiaoqi.security.admin.entity.MyWalletCath;
-import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.MyWalletMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppletWalletVo;
@@ -66,6 +63,9 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         @Autowired
         private AppUserAlipayBiz alipayBiz;
 
+        @Autowired
+        private AppUserLoginBiz appUserLoginBiz;
+
 
         private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12);
 
@@ -365,6 +365,12 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
     }
 
 
+  public void insertBatchWallet(){
+
+      List<AppUserLogin> appUserLogins = appUserLoginBiz.selectListAll();
+      List<Integer> userIds = appUserLogins.stream().map(AppUserLogin::getId).collect(Collectors.toList());
+
 
+  }
 
 }

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

@@ -73,6 +73,9 @@ public class UserBusinessBiz {
 
             if (userIdAndAppUserLoginMap!=null){
                 AppUserLogin appUserLogin = userIdAndAppUserLoginMap.get(appUserRelation.getUserId());
+                if (appUserLogin==null){
+                    continue;
+                }
                 userTeamMemberBo.setUserName(appUserLogin.getUsername());
             }
             if (userIdAndAppUserDetailMap!=null){
@@ -80,7 +83,7 @@ public class UserBusinessBiz {
                 userTeamMemberBo.setHeadUrl(appUserDetail==null?"":appUserDetail.getHeadimgurl());
                 userTeamMemberBo.setNickName(appUserDetail==null?"":appUserDetail.getNickname());
             }
-            BigDecimal income=memberIdAndIncomeMap.get(appUserRelation.getUserId())==null?BigDecimal.ZERO:memberIdAndIncomeMap.get(appUserRelation.getUserId());
+            BigDecimal income=memberIdAndIncomeMap.get(appUserRelation.getUserId())==null?new BigDecimal(0):memberIdAndIncomeMap.get(appUserRelation.getUserId());
             userTeamMemberBo.setIncome(income);
             totalIncome = totalIncome.add(income);
             userTeamMemberBos.add(userTeamMemberBo);