Merge branch 'prod' into test

This commit is contained in:
2025-12-15 15:47:38 +08:00
3 changed files with 24 additions and 26 deletions

View File

@@ -76,10 +76,6 @@ public class AuthorizationServiceImpl implements AuthorizationService {
return Map.of("code", captcha.toBase64(), "uuid", captchaKey);
}
public static void main(String[] args) {
System.out.println(DateUtil.format(DateUtil.date(), "HHmm"));
}
@Override
public LoginVO login(SysLoginDTO loginDTO, String platType) {
Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid());
@@ -224,7 +220,7 @@ public class AuthorizationServiceImpl implements AuthorizationService {
}
// 主店铺切换子店铺
if (headId != null && !shopInfo.getMainId().equals(shopId)) {
if (shopInfo.getMainId() != null && !shopInfo.getMainId().equals(shopId)) {
throw new CzgException("目标店铺非登录账号所有");
}