Merge branch 'master_position' into dev

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

@@ -16,6 +16,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
 @Transactional
 @DependsOn("appUserPositionBiz")
 @Service
+@Slf4j
 public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, AppUserPositionTemp> implements InitializingBean {
 
     @Autowired
@@ -299,4 +301,38 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     }
 
 
+    public  void   setPostionIdByPhone(String phone){
+        try {
+            Example example = new Example(AppUserPositionTemp.class);
+            example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
+            List<AppUserPositionTemp> list = selectByExample(example);
+            if (CollectionUtils.isEmpty(list)){
+                log.info("----用户无身份----phone==="+phone);
+                return;
+            }
+            AppUserPositionTemp positionTemp=list.get(0);
+            if (positionTemp.getUserId()>0){
+                log.info("----用户已存在身份----phone==="+phone);
+                return;
+            }
+            //根据手机号查询userId
+            AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+            if (userLogin==null) {
+                log.info("----用户不存在----phone==="+phone);
+                return;
+            }
+            Integer userId=userLogin.getId();
+            positionTemp.setUserId(userId);
+            int num=updateSelectiveByIdRe(positionTemp);
+            if (num>0){
+                Integer postionId=positionTemp.getPositionId();
+                log.info("----用户---postionId===="+postionId+"----phone==="+phone);
+                detailBiz.updateUserPositionByUserId(userId, postionId);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
 }

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

@@ -111,6 +111,9 @@ public class AppPermissionService {
     @Autowired
     private  AppUserPhoneNotesBiz notesBiz;
 
+    @Autowired
+    private  AppUserPositionTempBiz positionTempBiz;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -331,6 +334,8 @@ public class AppPermissionService {
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
             log.info("注册：创建钱包： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //临时身份绑定
+            positionTempBiz.setPostionIdByPhone(username);
             // 登录结果要做做统一处理
             JSONObject data = autoLogin(userid, username, headimgurl, nickname,code,activityCode,1);
 
@@ -967,6 +972,8 @@ public class AppPermissionService {
             log.error("注册：新增用户详情： " + userid);
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
+            //临时身份绑定
+            positionTempBiz.setPostionIdByPhone(username);
             //临时会员绑定
             insertUserMemberByUserIdAndPhone(userid, username);
             //上线绑定