Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -77,9 +77,4 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     }
 
-    @CacheClear(pre = "user{1}")
-    public void updateUserToMemberStatus(Integer userId){
-        mapper.updateUserMemberStatusByUserId(userId,1);
-    }
-
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -247,9 +247,6 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
-
-            insertUserMemberByUserIdAndPhone(userid,username);
-
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -265,6 +262,8 @@ public class AppPermissionService {
             rsUserDetail.setCode(UUIDUtils.genCodes(8));
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
+            //临时会员绑定
+            insertUserMemberByUserIdAndPhone(userid,username);
              //自动登录获取优惠卷
             authCoupn(userid);
             // 登录结果要做做统一处理
@@ -712,7 +711,12 @@ public class AppPermissionService {
     }
     //自动领取新人优惠卷
     public  String authCoupn(Integer userId){
+        try {
             return  activityFeign.led(userId);
+        }catch (Exception e){
+            e.printStackTrace();
+            return  null;
+        }
     }
 
 
@@ -761,9 +765,6 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
-
-             insertUserMemberByUserIdAndPhone(userid,username);
-
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -781,6 +782,8 @@ public class AppPermissionService {
             setCreateIPInfo(rsUserDetail);
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
+             //临时会员绑定
+            insertUserMemberByUserIdAndPhone(userid,username);
              //上线绑定
             relationBiz.bindByUserId(userid,small_id);
             //发送短信通知用户
@@ -853,7 +856,6 @@ public class AppPermissionService {
         if (CollectionUtils.isNotEmpty(memberExportDTOS)){
             insertUserMemberByExistUserMemberExportData(userId,memberExportDTOS);
             baseUserMemberExportBiz.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
-            appUserDetailBiz.updateUserToMemberStatus(userId);
         }
     }