|
|
|
@ -168,6 +168,33 @@ public final class HengjianFeeMapper { |
|
|
|
return requested; |
|
|
|
return requested; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 恒健的「未结算」哨兵日期。 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* <p><b>真机确认(2026-11-17)</b>:未结算的账单行会把 |
|
|
|
|
|
|
|
* {@code settlementAt} / {@code bookAt} 填成 {@code 1997-01-01 00:00:00}, |
|
|
|
|
|
|
|
* 不是 null。直接落库会让对账以为「1997 年结过一笔」。</p> |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
static final java.time.LocalDate NO_SETTLEMENT_DATE = java.time.LocalDate.of(1997, 1, 1); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 结算时间:哨兵日期转 null。 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param raw 仓方原始时间字符串 |
|
|
|
|
|
|
|
* @return 真实结算时间;未结算 / 空 / 无法解析时返回 null |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
static java.time.Instant settledAt(String raw) { |
|
|
|
|
|
|
|
java.time.Instant parsed = HengjianOrderMapper.parseTime(raw); |
|
|
|
|
|
|
|
if (parsed == null) { |
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (NO_SETTLEMENT_DATE.equals( |
|
|
|
|
|
|
|
parsed.atZone(java.time.ZoneOffset.UTC).toLocalDate())) { |
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return parsed; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// ================================================================ 仓储费
|
|
|
|
// ================================================================ 仓储费
|
|
|
|
|
|
|
|
|
|
|
|
/** 仓储费行 → 统一费用单据。 */ |
|
|
|
/** 仓储费行 → 统一费用单据。 */ |
|
|
|
@ -187,8 +214,7 @@ public final class HengjianFeeMapper { |
|
|
|
.feeType(WarehouseFeeType.STORAGE) |
|
|
|
.feeType(WarehouseFeeType.STORAGE) |
|
|
|
// 账单明细是已发生账目,不是预估
|
|
|
|
// 账单明细是已发生账目,不是预估
|
|
|
|
.estimated(false) |
|
|
|
.estimated(false) |
|
|
|
.settledAt(HengjianOrderMapper.parseTime( |
|
|
|
.settledAt(settledAt(row.settlementAt)) |
|
|
|
firstNonBlank(row.settlementAt, null))) |
|
|
|
|
|
|
|
.amount(amount) |
|
|
|
.amount(amount) |
|
|
|
.providerSku(trimToNull(row.sku)) |
|
|
|
.providerSku(trimToNull(row.sku)) |
|
|
|
.saleOrderNo(trimToNull(row.sourceNo)) |
|
|
|
.saleOrderNo(trimToNull(row.sourceNo)) |
|
|
|
@ -212,8 +238,8 @@ public final class HengjianFeeMapper { |
|
|
|
.feeName(trimToNull(row.settlementName)) |
|
|
|
.feeName(trimToNull(row.settlementName)) |
|
|
|
.feeType(WarehouseFeeType.LAST_MILE) |
|
|
|
.feeType(WarehouseFeeType.LAST_MILE) |
|
|
|
.estimated(false) |
|
|
|
.estimated(false) |
|
|
|
.settledAt(HengjianOrderMapper.parseTime( |
|
|
|
// 未结算行回 1997-01-01 哨兵;哨兵转 null,不回落到 chargeAt
|
|
|
|
firstNonBlank(row.settlementAt, row.chargeAt))) |
|
|
|
.settledAt(settledAt(row.settlementAt)) |
|
|
|
.amount(amount) |
|
|
|
.amount(amount) |
|
|
|
.providerSku(trimToNull(row.erpSku)) |
|
|
|
.providerSku(trimToNull(row.erpSku)) |
|
|
|
// 订单号口径:站内单号优先,其次是来源单号,最后平台单号
|
|
|
|
// 订单号口径:站内单号优先,其次是来源单号,最后平台单号
|
|
|
|
@ -240,8 +266,8 @@ public final class HengjianFeeMapper { |
|
|
|
.feeName(trimToNull(row.settlementName)) |
|
|
|
.feeName(trimToNull(row.settlementName)) |
|
|
|
.feeType(WarehouseFeeType.OPERATION) |
|
|
|
.feeType(WarehouseFeeType.OPERATION) |
|
|
|
.estimated(false) |
|
|
|
.estimated(false) |
|
|
|
.settledAt(HengjianOrderMapper.parseTime( |
|
|
|
// 未结算行回 1997-01-01 哨兵;哨兵转 null,不回落到 chargeAt
|
|
|
|
firstNonBlank(row.settlementAt, row.chargeAt))) |
|
|
|
.settledAt(settledAt(row.settlementAt)) |
|
|
|
.amount(amount) |
|
|
|
.amount(amount) |
|
|
|
.providerSku(trimToNull(row.relSku)) |
|
|
|
.providerSku(trimToNull(row.relSku)) |
|
|
|
.saleOrderNo(firstNonBlank(row.relOrderNo, row.sourceNo)) |
|
|
|
.saleOrderNo(firstNonBlank(row.relOrderNo, row.sourceNo)) |
|
|
|
|