소스 검색

国际邮件统一英文

lyhzzz 2 년 전
부모
커밋
e4bcee2d04

+ 1 - 0
src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -51,6 +51,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
         User user = userService.getByUserName(param.getUserName());
         LambdaQueryWrapper<DownloadOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DownloadOrder::getUserId,user.getId());
+        wrapper.eq(DownloadOrder::getPayStatus,1);
         wrapper.orderByDesc(DownloadOrder::getTradeTime);
         Page<DownloadOrder> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 

+ 6 - 0
src/main/java/com/fdkankan/ucenter/service/impl/MailTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.constants.ResultCode;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.mapper.IMailTemplateMapper;
@@ -43,6 +44,11 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
 
     @Override
     public MailTemplate getTemplate(Integer type,String lang) {
+        if(NacosProperty.uploadType.equals("aws")){
+            lang = "en";
+        }else {
+            lang = "zh";
+        }
         LambdaQueryWrapper<MailTemplate> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MailTemplate::getType,type);
         wrapper.eq(MailTemplate::getLang,lang);