diff --git a/src/views/supermarket/smHotelDownstreamPushLog/index.vue b/src/views/supermarket/smHotelDownstreamPushLog/index.vue index b17ea371..c9c40d95 100644 --- a/src/views/supermarket/smHotelDownstreamPushLog/index.vue +++ b/src/views/supermarket/smHotelDownstreamPushLog/index.vue @@ -6,7 +6,7 @@ :closable="false" show-icon class="mb-3" - title="资源推送默认只落失败。填「同步日志ID」可导出完善清单:圣诺 getInfo 无店、房型/产品编码匹配不上。入站失败可「重试」重放;资源流水「重试」为整店重推。" + title="本页只记下游(推资源/入站下单等)。上游拉列表/房价看「上游同步日志」;上游 order/add 报文在「酒店订单」详情→上游调用记录。资源推送默认只落失败;填同步日志ID可导出完善清单。" /> @@ -16,13 +16,13 @@ clearable filterable placeholder="全部" - style="width: 180px" + style="width: 220px" > @@ -258,8 +258,8 @@ import { useMessage, useMessageBox } from "/@/hooks/message" const queryRef = ref() const showSearch = ref(true) -/** 已启用下游伙伴,供筛选下拉 */ -const partnerOptions = ref([]) +/** 已启用下游伙伴,供筛选下拉(接口返回 {partnerCode,label}) */ +const partnerOptions = ref>([]) const detailVisible = ref(false) const detailLoading = ref(false) const detail = reactive({}) @@ -391,7 +391,16 @@ const loadPartnerOptions = async () => { const res: any = await listEnabledDownstreamPartners() const list = res?.data partnerOptions.value = Array.isArray(list) - ? list.map((x: any) => String(x)).filter(Boolean) + ? list + .map((x: any) => { + if (typeof x === "string") { + return { partnerCode: x, label: x } + } + const code = String(x?.partnerCode || "").trim() + if (!code) return null + return { partnerCode: code, label: x?.label || code } + }) + .filter(Boolean) : [] } catch { partnerOptions.value = [] diff --git a/src/views/supermarket/smHotelOrder/index.vue b/src/views/supermarket/smHotelOrder/index.vue index 9b4b1230..4d8abe8a 100644 --- a/src/views/supermarket/smHotelOrder/index.vue +++ b/src/views/supermarket/smHotelOrder/index.vue @@ -441,7 +441,7 @@
上游调用记录
- 支付后第三方下单 / 补偿查询 / 取消 / 自动退款均会落流水,便于核对上游异常。 + 展开行可看实际上游请求/响应(含 order/add 报文,密码已脱敏),便于与对方对账。
+ + + @@ -474,10 +489,10 @@ - +
{{ detailReqText }}
- +
{{ detailUpstreamText }}
diff --git a/src/views/supermarket/smHotelSyncLog/index.vue b/src/views/supermarket/smHotelSyncLog/index.vue index 0e1ac13e..e5bac0cf 100644 --- a/src/views/supermarket/smHotelSyncLog/index.vue +++ b/src/views/supermarket/smHotelSyncLog/index.vue @@ -396,7 +396,11 @@ const loadDownstreamPartners = async () => { try { const res: any = await listEnabledDownstreamPartners() const list = res?.data - downstreamPartners.value = Array.isArray(list) ? list.map((x: any) => String(x)).filter(Boolean) : [] + downstreamPartners.value = Array.isArray(list) + ? list + .map((x: any) => (typeof x === "string" ? x : String(x?.partnerCode || "").trim())) + .filter(Boolean) + : [] } catch { downstreamPartners.value = [] }