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

BUGFIX: design single - sketch modify

Browse Source
This commit is contained in:
xupei
2025-11-05 16:40:31 +08:00
parent b1b465a05a
commit 4fed5f7439
10 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
View File

@@ -82,7 +82,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
// 邮件通知审批者
String merchantEmail = "kimwong@code-create.com.hk";
String developer = "xupei3360@163.com";
String[] receiverEmail = {merchantEmail, developer};
String[] receiverEmail = {/*merchantEmail,*/ developer};
SendEmailUtil.affiliateEmailReminder(receiverEmail, new AffiliateEmailParamsDTO(userHolder.getUsername(), promotionMethod), "new");
// emailService.affiliateEmailReminder(Arrays.asList(/*merchantEmail,*/ developer), new AffiliateEmailParamsDTO(userHolder.getUsername(), promotionMethod), "new");
}else {
@@ -389,7 +389,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
String merchantEmail = "kimwong@code-create.com.hk";
String developer = "xupei3360@163.com";
String[] receiverEmail = {merchantEmail, developer};
String[] receiverEmail = {/*merchantEmail,*/ developer};
// 邮件通知
SendEmailUtil.affiliateEmailReminder(receiverEmail, affiliateEmailParamsDTO, "summary");
// emailService.affiliateEmailReminder(Arrays.asList(/*merchantEmail,*/ developer), affiliateEmailParamsDTO, "summary");

11
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -573,7 +573,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
// 画笔修改的sketch截图 上传后替换path
// 由于用户在系统或自己上传sketch的基础上修改过的衣服，再次修改后，第一次修改的衣服不会回到某个池子被再次利用，
// 所以，这里选择使用system或collection相同的地址，只是放在不同的桶，这样能保证图片服务器上,类似的sketch不会存在很多
sketchBase64ToPath(designSingleIncludeLayersDTO);
sketchBase64ToPath(designSingleIncludeLayersDTO, userId);
// 将标注后的mask上传到minio,并将minio地址传给python端
// todo 如果当前design使用的仍是旧的mask 则置maskUrl为null
@@ -653,7 +653,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
return selectById(designItemId); // 普通查询，不加锁
}
private void sketchBase64ToPath(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO){
private void sketchBase64ToPath(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO, Long userId){
designSingleIncludeLayersDTO.getDesignSingleItemDTOList().forEach(item -> {
// 如果sketch截图不为空，则将该截图上传，并替换path
if (!StringUtil.isNullOrEmpty(item.getSketchString())){
@@ -662,6 +662,13 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
}
String sourcePath = item.getPath();
String path = sourcePath.substring(sourcePath.indexOf("/") + 1, sourcePath.lastIndexOf("."));
// 路径组成：用户id + sketchboard + temp | modified + 原图所在不同桶的原路径
if (designSingleIncludeLayersDTO.getIsPreview()) {
path = userId + "/sketchboard/temp/" + path;
} else {
path = userId + "/sketchboard/modified/" + path;
}
// 将原图地址作为修改后的图片地址，放在不同的桶
String newPath = minioUtil.base64UploadToPath(item.getSketchString(), modifiedSketchBucket, path);
if (StringUtil.isNullOrEmpty(newPath)){

4
src/main/java/com/ai/da/service/impl/EmailServiceImpl.java
View File

@@ -586,7 +586,7 @@ public class EmailServiceImpl implements EmailService {
try {
String merchantEmail = "kimwong@code-create.com.hk";
String developer = "xupei3360@163.com";
List<String> merchantReceiver = Arrays.asList(merchantEmail, developer);
List<String> merchantReceiver = Arrays.asList(/*merchantEmail,*/ developer);
String merchantSubject = null;
String merchantTemplate = null;
@@ -706,7 +706,7 @@ public class EmailServiceImpl implements EmailService {
jsonObject.put("quantity", quantity);
jsonObject.put("totalFee", amount);
sendEmail(Arrays.asList(merchantEmail,developerEmail), jsonObject, CREDITS_PURCHASE_MERCHANT, "New Credit Purchase Order", null, null);
sendEmail(Arrays.asList(/*merchantEmail,*/developerEmail), jsonObject, CREDITS_PURCHASE_MERCHANT, "New Credit Purchase Order", null, null);
}
private final static String COMMON_EXCEPTION_REMINDER = "135279_common-exception-reminder.html";