|
@@ -236,10 +236,15 @@ public class OpenDouble11StaticsController extends BaseController {
|
|
|
Collection<String> values = musical.values().stream().map(String::valueOf).collect(Collectors.toList());
|
|
|
query.setGoodId(String.join(",", values));
|
|
|
}
|
|
|
- query.setStartPayTime(Optional.ofNullable(configParam.getStartPayTime()).orElse(new SimpleDateFormat(
|
|
|
- "yyyy-MM-dd HH:mm:ss").parse("2023-11-11 00:00:00", new ParsePosition(0))));
|
|
|
- query.setEndPayTime(Optional.ofNullable(configParam.getEndPayTime()).orElse(new SimpleDateFormat(
|
|
|
- "yyyy-MM-dd HH:mm:ss").parse("2023-11-11 23:59:59", new ParsePosition(0))));
|
|
|
+ SysConfig startTime = sysConfigService.findByParamName("2023_activity_start_time");
|
|
|
+ query.setStartPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(
|
|
|
+ Optional.ofNullable(startTime.getParanValue()).orElse("2023-11-11 00:00:00"),
|
|
|
+ new ParsePosition(0)));
|
|
|
+
|
|
|
+ SysConfig endTime = sysConfigService.findByParamName("2023_activity_end_time");
|
|
|
+ query.setEndPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(
|
|
|
+ Optional.ofNullable(endTime.getParanValue()).orElse("2023-11-11 23:59:59"),
|
|
|
+ new ParsePosition(0)));
|
|
|
} else if (saleStaticsType == 6) {
|
|
|
// 保价卡销售
|
|
|
query.setGroupType(GroupType.SPORADIC);
|