|
@@ -49,7 +49,7 @@ public class MindFortuneController {
|
|
|
public Result<FamilyFortune> refreshFortune(@RequestAttribute("userId") Long userId) {
|
|
public Result<FamilyFortune> refreshFortune(@RequestAttribute("userId") Long userId) {
|
|
|
if (userId == null) return Result.error("请先登录");
|
|
if (userId == null) return Result.error("请先登录");
|
|
|
Long familyId = membershipService.getUserFamilyId(userId);
|
|
Long familyId = membershipService.getUserFamilyId(userId);
|
|
|
- if (familyId == null) return Result.error("请先创建家庭");
|
|
|
|
|
|
|
+ if (familyId == null) return Result.noFamily("请先创建或加入家庭");
|
|
|
FamilyFortune fortune = fortuneService.getFamilyFortune(familyId, LocalDate.now());
|
|
FamilyFortune fortune = fortuneService.getFamilyFortune(familyId, LocalDate.now());
|
|
|
fortune.setLuckyDirection(fortuneService.calculateLuckyDirection(familyId, LocalDate.now()));
|
|
fortune.setLuckyDirection(fortuneService.calculateLuckyDirection(familyId, LocalDate.now()));
|
|
|
fortuneService.saveFamilyFortune(fortune);
|
|
fortuneService.saveFamilyFortune(fortune);
|
|
@@ -67,7 +67,7 @@ public class MindFortuneController {
|
|
|
@RequestBody ExportReportRequest request) {
|
|
@RequestBody ExportReportRequest request) {
|
|
|
if (userId == null) return Result.error("请先登录");
|
|
if (userId == null) return Result.error("请先登录");
|
|
|
Long familyId = membershipService.getUserFamilyId(userId);
|
|
Long familyId = membershipService.getUserFamilyId(userId);
|
|
|
- if (familyId == null) return Result.error("请先创建家庭");
|
|
|
|
|
|
|
+ if (familyId == null) return Result.noFamily("请先创建或加入家庭");
|
|
|
try {
|
|
try {
|
|
|
// 文件大小校验
|
|
// 文件大小校验
|
|
|
if (request.imageBase64 == null || request.imageBase64.length() > 4 * 1024 * 1024) {
|
|
if (request.imageBase64 == null || request.imageBase64.length() > 4 * 1024 * 1024) {
|