aidlab/lanecarford_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into prod/release_1.0

Browse Source
This commit is contained in:
litianxiang
2025-10-31 16:29:06 +08:00
parent 6f51762091 3caf0cd440
commit 1dae90ee59
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/aida/lanecarford/controller/VisitRecordController.java
View File

@@ -53,14 +53,9 @@ public class VisitRecordController {
log.info("开始查询顾客ID为{}的进店记录", customerId);
List<LibraryVo> result = visitRecordService.getByCustomerId(customerId);
if (result != null && !result.isEmpty()) {
log.info("查询成功，顾客ID为{}的进店记录为：{}", customerId, result);
return ApiResponse.success(result);
} else {
log.warn("没有找到顾客ID为{}的进店记录", customerId);
return ApiResponse.error("No visit records found for customer ID: " + customerId);
}
}
}

9
src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java
View File

@@ -491,12 +491,13 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
com.alibaba.fastjson.JSONObject candidate = candidates.getJSONObject(0);
String finishReason = candidate.getString("finishReason");
if (!"STOP".equals(finishReason)) {
String finishMessage = candidate.getString("finishMessage");
if ("IMAGE_SAFETY".equals(finishReason)) {
log.error("图片安全检查失败，请尝试修改提示词或图片");
throw new BusinessException("Image safety check failed", "图片安全检查失败", ResultEnum.ERROR.getCode());
if (finishReason != null && finishReason.equals("IMAGE_SAFETY")){
if (finishMessage != null && finishMessage.contains("Try rephrasing the prompt")) {
finishMessage = "Try rephrasing the prompt.If you think this was an error, send feedback.";
throw new BusinessException(finishMessage, "请尝试重新表述提示词。若您认为这是误判，可提交反馈。", ResultEnum.ERROR.getCode());
}
}
log.error("生成失败: {}", finishMessage);
throw new BusinessException("Image generation failed", "图片生成失败", ResultEnum.ERROR.getCode());

2
src/main/java/com/aida/lanecarford/service/impl/VisitRecordServiceImpl.java
View File

@@ -65,7 +65,7 @@ public class VisitRecordServiceImpl extends ServiceImpl<VisitRecordMapper, Visit
LambdaQueryWrapper<TryOnEffect> effectWrapper = new LambdaQueryWrapper<>();
effectWrapper.eq(TryOnEffect::getVisitRecordId, visitRecord.getId())
.eq(TryOnEffect::getIsFavorite, 1)
.orderByDesc(TryOnEffect::getCreatedTime)
.orderByAsc(TryOnEffect::getCreatedTime)
.last("LIMIT 1");
TryOnEffect favoriteEffect = tryOnEffectService.getOne(effectWrapper);