From a53c7619c3e0a7da9041e85a681de14c67820d68 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 28 Jan 2026 16:25:08 +0800 Subject: [PATCH] =?UTF-8?q?[WLOS-060]=20=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=BC=94=E7=BB=83=E4=B8=8E=E4=B8=8A=E7=BA=BF=E5=89=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C/=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E9=A2=84=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...17-04-15-whitelist-order-status-complete.csv | 2 +- ..._16-45-56-whitelist-order-status-complete.md | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/issues/2026-01-23_17-04-15-whitelist-order-status-complete.csv b/issues/2026-01-23_17-04-15-whitelist-order-status-complete.csv index 24fe71507..37faedc0d 100644 --- a/issues/2026-01-23_17-04-15-whitelist-order-status-complete.csv +++ b/issues/2026-01-23_17-04-15-whitelist-order-status-complete.csv @@ -4,4 +4,4 @@ "WLOS-030","P0","3","backend","设计并落地统一的白名单订单完成补偿方法","在订单领域服务中新增可复用且幂等的补偿方法，专门用于白名单订单从异常/待结算修正为完成，并补齐必要字段。","新增补偿方法（如 completeWhitelistOrderIfNeeded(orderCode) 或等价实现）：1) 判定 payMode=3 且状态在 {ABNORMAL, STAY_SETTLEMENT}；2) 幂等（重复调用不产生额外副作用）；3) 更新为 ORDER_COMPLETE 并处理 settlement_time（为空则置当前时间）及约定的金额/状态字段默认值；4) 记录可追溯日志（至少包含订单号、原状态、新状态）。","AUTOSERVER","检查金额字段默认策略是否会影响对账；时间字段是否符合既有语义；方法是否避免不必要的外部调用（如远程停机/拉交易）。","回归验证：在真实/模拟数据上重复调用、并发调用无异常；下游依赖（通知/解锁/MQ/分账退款）要么保持一致，要么明确不触发并有说明。","已完成","已完成","已完成","已提交","","plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:27; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:30; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:54; jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderStatusEnum.java:14; jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java:11; jsowell-admin/src/main/java/com/jsowell/service/OrderService.java:1629; jsowell-admin/src/main/java/com/jsowell/service/WhitelistOrderCompletionDefaults.java:17; jsowell-admin/src/test/java/com/jsowell/service/WhitelistOrderCompletionDefaultsTest.java:1","picked_reason:unblocks core capability for WLOS-040/WLOS-050; done_at:2026-01-28; evidence:added completeWhitelistOrderIfNeeded + defaults helper + unit test; validation_limited:jsowell-admin module compilation fails due to missing types (e.g., CarNumberBindDTO, com.jsowell.pile.jcpp.*), tests not runnable until fixed; manual_test:mvn -pl jsowell-admin test -Dtest=WhitelistOrderCompletionDefaultsTest; risk:low additive method not yet wired into flows" "WLOS-040","P0","4","backend","改造白名单结算入口以支持异常/待结算并复用补偿逻辑","调整 TempService.whiteListSettlement 及对应接口，使其支持 ABNORMAL/待结算两种状态并调用统一补偿方法，避免硬编码与不必要外部依赖。","1) TempService.whiteListSettlement 支持状态=ABNORMAL 或 STAY_SETTLEMENT；2) payMode 判断改为使用 OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue()；3) 默认走统一补偿方法完成状态修正；4) 若保留 manualSettlementOrder 调用，需明确触发条件与降级策略（避免依赖外部设备/交易服务导致批量失败）。","AUTOSERVER","Review时重点：权限/入参校验是否合理；批量处理时的错误隔离与日志；是否需要对调用方预期做兼容（原先只允许异常）。","回归时验证：接口对非白名单/非目标状态不改动；批量输入中单个失败不影响其他（如有此需求则实现并说明）。","已完成","已完成","已完成","已提交","","plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:35; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:39; jsowell-admin/src/main/java/com/jsowell/service/TempService.java:1504; jsowell-admin/src/main/java/com/jsowell/service/TempService.java:1516; jsowell-admin/src/main/java/com/jsowell/service/TempService.java:1525; jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java:1043; jsowell-admin/src/main/java/com/jsowell/service/OrderService.java:1629; jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java:11","picked_reason:wire whitelist入口 to unified compensation method; done_at:2026-01-28; evidence:whiteListSettlement now allows ABNORMAL/STAY_SETTLEMENT + uses OrderPayModeEnum + delegates to completeWhitelistOrderIfNeeded; validation_limited:jsowell-admin module compilation fails due to missing types (e.g., CarNumberBindDTO, com.jsowell.pile.jcpp.*), tests not runnable until fixed; manual_test:POST /whiteListSettlement with whitelist orders in status 4/2 then verify order_basic_info.order_status=6 and settlement_time set when null; risk:medium endpoint behavior changed (no longer calls manualSettlementOrder/remote stop)" "WLOS-050","P0","5","backend","补齐白名单状态修正的单测/集成测试与回归场景","为白名单订单状态修正逻辑新增测试用例，确保异常/待结算均可修正且非白名单不会被误改。","新增/更新测试并通过：1) 白名单+异常(4) -> 完成(6)；2) 白名单+待结算(2) -> 完成(6)；3) 非白名单订单不变；4) 关键字段（如 settlement_time）按约定填充；执行 `mvn -pl jsowell-admin test` 通过。","AUTOSERVER","Review时关注：测试数据构造是否贴近真实（金额/时间/状态）；是否覆盖幂等与边界输入（空字段、重复调用）。","完成后回归：全量后端测试通过；若有接口层变化，补充接口测试或Mock验证。","已完成","已完成","已完成","已提交","","plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:41; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:46; jsowell-admin/src/main/java/com/jsowell/service/TempService.java:1504; jsowell-admin/src/main/java/com/jsowell/service/TempService.java:1525; jsowell-admin/src/main/java/com/jsowell/service/OrderService.java:1629; jsowell-admin/src/test/java/com/jsowell/service/OrderServiceWhitelistCompletionTest.java:1; jsowell-admin/src/test/java/com/jsowell/service/WhitelistOrderCompletionDefaultsTest.java:1","picked_reason:add tests for whitelist compensation + rerun mvn with -am; done_at:2026-01-28; evidence:added unit tests covering whitelist ABNORMAL/STAY_SETTLEMENT -> COMPLETE and non-whitelist no-op; validation_limited:mvn build fails in jsowell-common with javac NoSuchFieldError (JDK/toolchain mismatch), cannot run tests in this environment; manual_test:set JAVA_HOME to JDK8 then run mvn -pl jsowell-admin -am test; risk:low tests only" -"WLOS-060","P0","6","backend","测试环境演练与上线前数据校验/回滚预案","在测试环境按订单号列表演练修正接口，校验DB字段变化，并准备可执行的回滚/审计方案。","1) 在测试环境对选定订单号列表调用 /whiteListSettlement（或等价入口）成功；2) DB 校验：order_basic_info.order_status=6 且 settlement_time/金额字段符合约定；3) 形成可执行回滚步骤（SQL/脚本/手工流程）并记录在PR描述或运维文档中；4) 日志中可追溯到修正前后状态。","AUTOE2E","Review过程中确认：是否需要灰度/限流；批量处理失败的可观测性（日志/告警）；是否保留原状态用于追溯。","上线前回归：随机抽样多笔订单复测；验证不会导致下游不一致（通知/解锁/MQ/分账退款）或已明确不会触发并可接受。","未开始","未开始","未开始","未提交","","plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:48; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:50; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:52; jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java:1043","" +"WLOS-060","P0","6","backend","测试环境演练与上线前数据校验/回滚预案","在测试环境按订单号列表演练修正接口，校验DB字段变化，并准备可执行的回滚/审计方案。","1) 在测试环境对选定订单号列表调用 /whiteListSettlement（或等价入口）成功；2) DB 校验：order_basic_info.order_status=6 且 settlement_time/金额字段符合约定；3) 形成可执行回滚步骤（SQL/脚本/手工流程）并记录在PR描述或运维文档中；4) 日志中可追溯到修正前后状态。","AUTOE2E","Review过程中确认：是否需要灰度/限流；批量处理失败的可观测性（日志/告警）；是否保留原状态用于追溯。","上线前回归：随机抽样多笔订单复测；验证不会导致下游不一致（通知/解锁/MQ/分账退款）或已明确不会触发并可接受。","已完成","已完成","已完成","已提交","","plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:77; plan/2026-01-23_16-45-56-whitelist-order-status-complete.md:88; jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java:54; jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java:1043; jsowell-admin/src/main/java/com/jsowell/service/OrderService.java:1673","picked_reason:write executable manual runbook + rollback plan for test/prod; done_at:2026-01-28; evidence:added runnable rehearsal + rollback runbook in plan/2026-01-23_16-45-56-whitelist-order-status-complete.md; validation_limited:no access to test environment/DB/logs from this session to execute rehearsal; manual_test:follow plan runbook (snapshot DB -> POST /temp/whiteListSettlement -> verify SQL/logs -> rollback if needed); risk:medium rehearsal not executed yet" diff --git a/plan/2026-01-23_16-45-56-whitelist-order-status-complete.md b/plan/2026-01-23_16-45-56-whitelist-order-status-complete.md index 23097ea8e..bcbfd6843 100644 --- a/plan/2026-01-23_16-45-56-whitelist-order-status-complete.md +++ b/plan/2026-01-23_16-45-56-whitelist-order-status-complete.md @@ -74,8 +74,21 @@ created_at: 2026-01-23T16:45:56.6767838+08:00 - 运行验证命令：`mvn -pl jsowell-admin test`（必要时指定测试类）。 6. 数据校验与上线准备 - - 在测试环境执行一次“选定订单号列表”的演练：调用 `/whiteListSettlement`，检查 DB 中 `order_basic_info.order_status` 与关键金额/时间字段。 - - 记录回滚策略：如发现误改，可按订单号将状态回退到原值（建议在修正前记录原状态/时间到日志或审计表）。 + - 演练入口：`POST /temp/whiteListSettlement` + - body（示例）：`{"orderCodeList":["O1","O2"]}` + - 演练前（务必留存快照，用于回滚/审计）： + - DB 快照（示例 SQL）： + - `SELECT order_code,pay_mode,order_status,pay_status,settlement_time,order_amount,virtual_amount,settle_amount,actual_received_amount,refund_amount,reason FROM order_basic_info WHERE order_code IN ('O1','O2');` + - 将查询结果保存到工单/PR/运维记录（CSV/截图均可）。 + - 演练后（校验点）： + - `order_basic_info.order_status = 6` + - `settlement_time`：原为空则已填充；原非空保持不变 + - 金额字段符合“规则清单”默认策略（白名单虚拟金额/结算金额等） + - 日志可追溯：搜索 `completeWhitelistOrderIfNeeded updated orderCode:`，应包含订单号与状态变更前后值 + - 回滚预案（可执行）： + - 原则：以“演练前快照”为准逐单回退（避免盲目回退影响正常订单）。 + - 回滚 SQL（模板，按快照逐单生成）： + - `UPDATE order_basic_info SET order_status='', settlement_time='', order_amount=, virtual_amount=, settle_amount=, actual_received_amount=, refund_amount=, pay_status='' WHERE order_code='';` ⚠️ 风险与注意事项 - 业务风险：将异常/待结算直接置为完成可能掩盖真实设备/交易异常；需确认是否仍需要保留异常原因字段或额外审计。