|
|
@@ -36,7 +36,6 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -579,7 +578,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
Map<String, Object> par = new HashMap<>();
|
|
|
par.put("tenantId", tenantId);
|
|
|
List<TenantInfoInfoPageVo> tenantInfos = baseMapper.queryPage(par);
|
|
|
- if(CollectionUtils.isNotEmpty(tenantInfos)){
|
|
|
+ if (CollectionUtils.isNotEmpty(tenantInfos)) {
|
|
|
TenantInfoInfoPageVo tenantInfo = tenantInfos.get(0);
|
|
|
//邮件
|
|
|
if (StringUtils.isNotBlank(tenantInfo.getEmail())) {
|
|
|
@@ -874,15 +873,15 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
par.put("state", 1);
|
|
|
par.put("expiryDate", expiryDate);
|
|
|
List<TenantInfoInfoPageVo> oneTenant = baseMapper.queryPage(par);
|
|
|
- send(oneTenant, DateUtils.formatDate(expiryDate, "yyyy年MM月dd日"));
|
|
|
+ send(oneTenant, DateUtils.formatDate(expiryDate, "yyyy年MM月dd日"), i);
|
|
|
}
|
|
|
|
|
|
- private void send(List<TenantInfoInfoPageVo> infoList, String dateStr) {
|
|
|
+ private void send(List<TenantInfoInfoPageVo> infoList, String dateStr, int i) {
|
|
|
infoList.forEach(t -> {
|
|
|
//邮件
|
|
|
if (StringUtils.isNotBlank(t.getEmail())) {
|
|
|
//机构名称 服务名称 到期时间 学员数量
|
|
|
- Object[] emailMsg = {t.getName(), t.getServeName(), dateStr, t.getStudentUpLimit()};
|
|
|
+ Object[] emailMsg = {t.getName(), t.getServeName(), dateStr, t.getStudentUpLimit(), i};
|
|
|
Map<Integer, String> sendPar = new HashMap<>();
|
|
|
sendPar.put(t.getUserId(), t.getEmail());
|
|
|
log.info("platformSendToAll>>> 即将到期 receiveUserId {} email {} objs {} sendPar {}", t.getUserId(), t.getEmail(), emailMsg, sendPar);
|
hgw