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

TASK:将PromotionCode合并到生产-test

Browse Source
This commit is contained in:
xupei
2025-05-20 16:53:48 +08:00
parent 31bb29f2fd
commit 9a81fb7ee4
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/common/enums/ProductEnum.java
View File

@@ -13,7 +13,7 @@ public enum ProductEnum {
// 月度订阅
MonthlySubscription("AiDA Monthly Subscription", 500L),
// 测试
DailySubscription("AiDA Daily Subscription", 5L),
DailySubscription("AiDA Daily Subscription", 10L),
;
/**

13
src/main/java/com/ai/da/common/utils/SendEmailUtil.java
View File

@@ -827,9 +827,12 @@ public class SendEmailUtil {
// private final static Long NEW_MERCHANT_EN = 130721L;
// private final static Long NEW_USER_EN = 130722L;
// private final static Long NEW_USER_CN = 130723L;
private final static Long NEW_MERCHANT_EN = 135190L;
private final static Long NEW_USER_EN = 135189L;
private final static Long NEW_USER_CN = 135186L;
private final static Long NEW_MERCHANT_EN = 140335L;
// private final static Long NEW_MERCHANT_EN = 135190L;
// private final static Long NEW_USER_EN = 135189L;
// private final static Long NEW_USER_CN = 135186L;
private final static Long NEW_USER_EN = 140316L;
private final static Long NEW_USER_CN = 140317L;
private final static Long RENEWAL_MERCHANT_EN = 130724L;
private final static Long RENEWAL_USER_EN = 130725L;
private final static Long RENEWAL_USER_CN = 130726L;
@@ -844,7 +847,7 @@ public class SendEmailUtil {
try {
String merchantEmail = "kimwong@code-create.com.hk";
String developer = "xupei3360@163.com";
String[] receiverEmail = {merchantEmail, developer};
String[] receiverEmail = {/*merchantEmail, */developer};
Credential cred = new Credential(SECRET_ID, SECRET_KEy);
// 实例化一个http选项，可选的，没有特殊需求可以跳过
HttpProfile httpProfile = new HttpProfile();
@@ -1014,7 +1017,7 @@ public class SendEmailUtil {
req.setFromEmailAddress(SEND_ADDRESS);
String merchantEmail = "kimwong@code-create.com.hk";
String developerEmail = "xupei@code-create.com.hk";
req.setDestination(new String[]{merchantEmail, developerEmail});
req.setDestination(new String[]{/*merchantEmail, */developerEmail});
Template template = new Template();
req.setSubject("New Credit Purchase Order");
template.setTemplateID(CREDITS_PURCHASE_MERCHANT);

7
src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
View File

@@ -18,7 +18,7 @@ import com.ai.da.model.enums.StyleEnum;
import com.ai.da.model.vo.*;
import com.ai.da.python.PythonService;
import com.ai.da.python.vo.DesignPythonItem;
import com.ai.da.python.vo.ImageSegmentation;
//import com.ai.da.python.vo.ImageSegmentation;
import com.ai.da.service.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -971,7 +971,8 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
}
// 对于上传图片或者从library选择的图片进行图片分割
public List<CollectionElementVO> selectedImageSeg(List<MultipartFile> files, Long id, String type) {
// todo 图像分割 开发分支代码 暂时以注释形式存在
/*public List<CollectionElementVO> selectedImageSeg(List<MultipartFile> files, Long id, String type) {
Long accountId = UserContext.getUserHolder().getId();
List<CollectionElementVO> resp = new ArrayList<>();
List<ImageSegmentation.ImageDate> imageDates = new ArrayList<>();
@@ -1061,6 +1062,6 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
}
vo.setSegmentedImages(segUrls);
return vo;
}
}*/
}

8
src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
View File

@@ -1153,11 +1153,13 @@ public class StripeServiceImpl implements StripeService {
emailParamsDTO.setSubscriptionType(subscriptionInfo.getType());
emailParamsDTO.setStartDate(DateUtil.changeTimeStampFormat(orderByOrderNo.getCreateTime()));
if (subscriptionInfo.getType().equals("month")){
emailParamsDTO.setRenewalFee(String.valueOf(500));
emailParamsDTO.setRenewalFee(String.valueOf(ProductEnum.MonthlySubscription.getPrice()));
} else if (subscriptionInfo.getType().equals("year")){
emailParamsDTO.setRenewalFee(String.valueOf(5000));
emailParamsDTO.setRenewalFee(String.valueOf(ProductEnum.AnnualSubscription.getPrice()));
} else if (subscriptionInfo.getType().equals("day")){
emailParamsDTO.setRenewalFee(String.valueOf(ProductEnum.DailySubscription.getPrice()));
} else {
emailParamsDTO.setRenewalFee(emailParamsDTO.getTotalFee());
emailParamsDTO.setRenewalFee("?");
}
if (subscriptionInfo.getStatus().equals("active")){
if (language.equals("ENGLISH")){