|
|
@@ -24,6 +24,7 @@ import com.cyksj.mapper.manage.distribute.UserPlatDistributeRateMapper;
|
|
|
import com.cyksj.mapper.manage.distribute.UserPlatSkuDistributeRateMapper;
|
|
|
import com.cyksj.mapper.mirrorshop.UserMirrorShopMapper;
|
|
|
import com.cyksj.mapper.renew.RenewUpgradePackageMapper;
|
|
|
+import com.cyksj.mapper.sys.SysConfigMapper;
|
|
|
import com.cyksj.mapper.sys.SysEmailMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.manage.views.AccountView;
|
|
|
@@ -59,10 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.Optional;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.ExecutionException;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
@@ -167,6 +165,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
|
|
|
private final CommonMailService commonMailService;
|
|
|
|
|
|
+ private final SysConfigMapper sysConfigMapper;
|
|
|
+
|
|
|
private final GptMirrorDayCardGiveawayActivityMapper gptMirrorDayCardGiveawayActivityMapper;
|
|
|
|
|
|
@Override
|
|
|
@@ -221,6 +221,16 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
//gpt日卡活动
|
|
|
GptMirrorDayCardGiveawayActivity gptMirrorDayCardGiveawayActivity = gptMirrorDayCardGiveawayActivityMapper.selectOne(Wrappers.lambdaQuery(GptMirrorDayCardGiveawayActivity.class)
|
|
|
.last("limit 1"));
|
|
|
+ SysConfig sysConfig = sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
|
|
|
+ .eq(SysConfig::getSysKey, Constant.EMAIL_PWD_SHOW_GID_KEY)
|
|
|
+ .last("limit 1"));
|
|
|
+ List<Long> showEmailPwdGids = new ArrayList<>();
|
|
|
+ if (sysConfig != null && StrUtil.isNotBlank(sysConfig.getSysValue())) {
|
|
|
+ try {
|
|
|
+ showEmailPwdGids.addAll(Jsons.parseList(sysConfig.getSysValue(), Long.class));
|
|
|
+ } catch (Exception e) {
|
|
|
+ }
|
|
|
+ }
|
|
|
list.getDataList().forEach(ticket -> {
|
|
|
if (ticket.getSkuId() == null || ticket.getGoodsId() == null) {
|
|
|
return;
|
|
|
@@ -256,7 +266,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (ticket.getGoodsId() == 18l && ticket.getNum() == 1 && ticket.getAccount() != null && ticket.getCreatedTime().compareTo(DateUtil.parse("2025-02-01")) > 0) {
|
|
|
|
|
|
} else {
|
|
|
- if (ticket.getGoodsId() != 30l) {
|
|
|
+ if (!showEmailPwdGids.contains(ticket.getGoodsId())) {
|
|
|
ticket.setGptEmailPwd(null);
|
|
|
}
|
|
|
}
|