diff --git a/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java index f9ded90d..714ce498 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java @@ -27,7 +27,9 @@ import com.bms.price.domain.PrcBillingTaskRetryTask; import com.bms.price.domain.vo.BillingTaskSubmitRequest; import com.bms.price.domain.vo.TabOrderMonitorQuery; import com.bms.price.domain.vo.TabOrderMonitorVo; +import com.bms.price.enums.BillOrderStatus; import com.bms.price.enums.BillTaskSuccessStatus; +import com.bms.price.enums.BillTaskType; import com.bms.price.oracle.TabOrderMonitorService; import com.bms.price.search.IBillSearchStore; import com.bms.price.search.TabOrderSyncEsLog; @@ -200,7 +202,7 @@ public class TabOrderSyncAsyncRunner /** * Sync or refund selected rows. - * @param billType optional PENDING/REBILL/REFUND; null = auto PENDING/REBILL + * @param billType optional PENDING/REBILL/REFUND; null = auto by orderStatus / bill existence */ public Map syncRowsParallel(List rows, String billType) { @@ -219,7 +221,7 @@ public class TabOrderSyncAsyncRunner /** * Sync or refund selected rows carrying the upstream Oracle full row (skip re-query). - * @param billType optional PENDING/REBILL/REFUND; null = auto PENDING/REBILL + * @param billType optional PENDING/REBILL/REFUND; null = auto by orderStatus / bill existence */ public Map syncRowsParallelRows(List rows, String billType) { @@ -509,6 +511,11 @@ public class TabOrderSyncAsyncRunner { req.setBillType(billType.trim()); } + else if (BillOrderStatus.REFUNDED.matches(row.getOrderStatus())) + { + // Upstream 已退件 (ORDER_STATUS=9) -> fee refund task + req.setBillType(BillTaskType.REFUND.getCode()); + } return req; } } diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue index b95e5cea..f1cc5b7c 100644 --- a/bms-front/src/views/monitor/orderSource/index.vue +++ b/bms-front/src/views/monitor/orderSource/index.vue @@ -456,7 +456,8 @@ function toSyncRow(row) { orgOrderId: row.orgOrderId, transferOrderId: row.transferOrderId, customerCode: row.customerCode, - pickupDate: row.pickupDate + pickupDate: row.pickupDate, + orderStatus: row.orderStatus } }