V4.0.9版本更新合伙人H5端调整
This commit is contained in:
@@ -127,3 +127,58 @@ export function shanghaiPeriodYmds(periodStart: Date): { periodStart: string; pe
|
||||
periodEnd: shanghaiYmd(new Date(endExclusive.getTime() - 1)),
|
||||
};
|
||||
}
|
||||
|
||||
/** 0=周日 … 6=周六,按北京日历日 */
|
||||
export function shanghaiWeekday(d: Date): number {
|
||||
return new Date(`${shanghaiYmd(d)}T12:00:00+08:00`).getUTCDay();
|
||||
}
|
||||
|
||||
/** 北京自然周:周一 00:00 ~ 下周一 00:00(不含) */
|
||||
export function shanghaiWeekRange(anchor = new Date()): { start: Date; endExclusive: Date } {
|
||||
const dayStart = startOfShanghaiDay(anchor);
|
||||
const wd = shanghaiWeekday(dayStart);
|
||||
const daysFromMonday = wd === 0 ? 6 : wd - 1;
|
||||
const start = addShanghaiDays(dayStart, -daysFromMonday);
|
||||
return { start, endExclusive: addShanghaiDays(start, 7) };
|
||||
}
|
||||
|
||||
export function shanghaiWeekLastInstant(anchor = new Date()): Date {
|
||||
return new Date(shanghaiWeekRange(anchor).endExclusive.getTime() - 1);
|
||||
}
|
||||
|
||||
export function previousShanghaiWeek(anchor = new Date()): { start: Date; endExclusive: Date } {
|
||||
return shanghaiWeekRange(addShanghaiDays(shanghaiWeekRange(anchor).start, -1));
|
||||
}
|
||||
|
||||
/** 下一个合伙人出账时刻:周一 08:00(若尚未到本周一 08:00 则为当日) */
|
||||
export function nextPartnerBillIssueAt(anchor = new Date()): Date {
|
||||
const { start } = shanghaiWeekRange(anchor);
|
||||
const thisMonday8 = new Date(start.getTime() + 8 * 60 * 60 * 1000);
|
||||
if (anchor.getTime() < thisMonday8.getTime()) return thisMonday8;
|
||||
return new Date(addShanghaiDays(start, 7).getTime() + 8 * 60 * 60 * 1000);
|
||||
}
|
||||
|
||||
export function shanghaiPeriodYmdsForWeek(periodStart: Date): { periodStart: string; periodEnd: string } {
|
||||
const { start } = shanghaiWeekRange(periodStart);
|
||||
return {
|
||||
periodStart: shanghaiYmd(start),
|
||||
periodEnd: shanghaiYmd(addShanghaiDays(start, 6)),
|
||||
};
|
||||
}
|
||||
|
||||
/** 周账用真实起止日;跨度超过 8 天则按月展示(兼容历史月账) */
|
||||
export function shanghaiBillPeriodYmds(
|
||||
periodStart: Date,
|
||||
periodEnd?: Date,
|
||||
): { periodStart: string; periodEnd: string } {
|
||||
if (periodEnd) {
|
||||
const days = shanghaiCalendarDaysBetween(periodStart, periodEnd);
|
||||
if (days >= 0 && days <= 8) {
|
||||
return {
|
||||
periodStart: shanghaiYmd(periodStart),
|
||||
periodEnd: shanghaiYmd(periodEnd),
|
||||
};
|
||||
}
|
||||
}
|
||||
return shanghaiPeriodYmds(periodStart);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user