Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WestreamUserServiceImpl.java

@@ -62,6 +62,9 @@ public class WestreamUserServiceImpl extends BaseServiceImpl<WestreamUserMapper,
         if (null == westreamUser.getTenantId() || StringUtils.isEmpty(westreamUser.getOpenid())) {
             return JsonResult.error("参数为空！");
         }
+        if (StringUtils.isEmpty(westreamUser.getUnionid())) {
+            return JsonResult.error("unionid为空！");
+        }
         WestreamUser westreamUserQuery = westreamUserMapper.selectOne(new LambdaQueryWrapper<WestreamUser>()
                 .eq(WestreamUser::getMark, 1)
                 .eq(WestreamUser::getTenantId, westreamUser.getTenantId())
@@ -82,6 +85,7 @@ public class WestreamUserServiceImpl extends BaseServiceImpl<WestreamUserMapper,
             westreamUserMapper.updateById(westreamUser);
         } else {
             westreamUserQuery.setLoginNum(westreamUserQuery.getLoginNum() + 1);
+            westreamUserQuery.setUnionid(westreamUser.getUnionid());
             westreamUserMapper.updateById(westreamUserQuery);
         }