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

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -74,6 +74,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         resiLoginFormDTO.setWxCode(formDTO.getWxCode());
         Result<UserWechatDTO> result = epmetThirdFeignClient.resiAndWorkLogin(resiLoginFormDTO);
         if (!result.success()) {
+            logger.error("居民端小程序登陆，调用epmet_third服务获取数据失败");
             throw new RenException(result.getCode());
         }
         UserWechatDTO userWechatDTO = result.getData();
@@ -149,6 +150,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         resiLoginFormDTO.setWxCode(formDTO.getWxCode());
         Result<UserWechatDTO> result = epmetThirdFeignClient.resiAndWorkLogin(resiLoginFormDTO);
         if (!result.success()) {
+            logger.error("工作端小程序登陆，调用epmet_third服务获取数据失败");
             throw new RenException(result.getCode());
         }
         UserWechatDTO userWechatDTO = result.getData();

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -199,24 +199,32 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(dto);
 
         UserWechatEntity userWechatEntity = ConvertUtils.sourceToTarget(wechatDTO, UserWechatEntity.class);
+        if ("".equals(userWechatEntity.getUnionId())) {
+            userWechatEntity.setUnionId(null);
+        }
         //2.不存在则新增，存在则更新
-        if(null==userDTO||null==userDTO.getId()){
+        if (null == userDTO || null == userDTO.getId()) {
             //user表新增
             UserEntity userEntity = new UserEntity();
             userEntity.setFromApp(UserConstant.APP_RESI);
             userEntity.setFromClient(UserConstant.CLIENT_WX);
-            if(baseDao.insert(userEntity)< NumConstant.ONE){
+            if (baseDao.insert(userEntity) < NumConstant.ONE) {
+                log.error("小程序登陆，居民端user表新增数据失败");
                 throw new RenException(UserConstant.SAVE_USER);
             }
             //user_wechat表新增
             userWechatEntity.setUserId(userEntity.getId());
-            if(userWechatDao.insert(userWechatEntity)< NumConstant.ONE){
+            if (userWechatDao.insert(userWechatEntity) < NumConstant.ONE) {
+                log.error("小程序登陆，居民端user_wechat表新增数据失败");
                 throw new RenException(UserConstant.SAVE_USER_WECHAT);
             }
             resultDTO.setId(userEntity.getId());
-        }else {
-            wechatDTO.setId(userDTO.getId());
-            if(userWechatDao.updateByUserId(wechatDTO)< NumConstant.ONE){
+        } else {
+            wechatDTO.setUserId(userDTO.getId());
+            wechatDTO.setUpdatedBy(userDTO.getId());
+            wechatDTO.setUpdatedTime(new Date());
+            if (userWechatDao.updateByUserId(wechatDTO) < NumConstant.ONE) {
+                log.error("小程序登陆，居民端user_wechat表更新数据失败");
                 throw new RenException(UserConstant.UPDATE_USER_WECHAT);
             }
             resultDTO.setId(userDTO.getId());