zhuyifan

fix

......@@ -70,6 +70,7 @@ public class LoginInterceptor implements HandlerInterceptor {
StpUtil.checkLogin();
final var enterpriseId = Convert.toInt(StpUtil.getExtra(CommonConstants.ENTERPRISE_ID));
final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE));
final var userId = StpUtil.getExtra(CommonConstants.USER_ID);
if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) {
final var openId = Convert.toStr(StpUtil.getExtra(CommonConstants.OPEN_ID));
final var loginId = StpUtil.getLoginIdAsInt();
......@@ -115,8 +116,7 @@ public class LoginInterceptor implements HandlerInterceptor {
builder.id(loginId).enterpriseId(enterpriseId).name(operator.getName()).loginSource(LoginSourceEnum.KDS);
return true;
} else {
final var loginId = StpUtil.getLoginIdAsString();
builder.openId(loginId).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
builder.id(userId == null ? null : Convert.toInt(userId)).openId(StpUtil.getLoginIdAsString()).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
return true;
}
}
......
......@@ -67,8 +67,9 @@ public class LoginServiceImpl implements LoginService {
mpAccountId = mpAccountByOpenId.getId();
}
Assert.isTrue(mpAccountId != 0, "创建小程序账号失败");
StpUtil.login(mpAccountId, SaLoginModel.create()
StpUtil.login(loginDto.getOpenId(), SaLoginModel.create()
.setExtra(CommonConstants.ENTERPRISE_ID, loginDto.getEnterpriseId())
.setExtra(CommonConstants.USER_ID, mpAccountId)
.setExtra(CommonConstants.LOGIN_SOURCE, loginDto.getLoginSourceEnum().getValue())
.build());
return StpUtil.getTokenInfo();
......