Commit 238d0c8d authored by wushanjing's avatar wushanjing

补齐智能接单剩余依赖

parent 07a54ea1
......@@ -44,6 +44,8 @@ class ManualOrderData:
dispatch_price_mode: str = "percent"
dispatch_price_percent: str = "90"
sub_order_title: str = ""
security_deposit: str = "0"
efficiency_deposit: str = "0"
service_hours: str = "14"
boss_phone: str = "13800138000"
contact_phone: str = "13800138000"
......@@ -4162,8 +4164,8 @@ class WanzhangguiOrderPage(TenantAuthPage):
else:
self.fill_row_input(row, "请输入发单价", price_value)
self.fill_row_input(row, "请输入代练时限", order.service_hours)
self.fill_row_input(row, "请输入安全保证金", "0")
self.fill_row_input(row, "请输入效率保证金", "0")
self.fill_row_input(row, "请输入安全保证金", order.security_deposit)
self.fill_row_input(row, "请输入效率保证金", order.efficiency_deposit)
self.fill_row_input(row, "请输入联系电话", order.contact_phone)
self.page.wait_for_timeout(800)
......@@ -4363,8 +4365,8 @@ class WanzhangguiOrderPage(TenantAuthPage):
[title, order.orderTitle],
[price, order.priceValue],
[hours, order.serviceHours],
[safe, '0'],
[efficiency, '0'],
[safe, order.securityDeposit],
[efficiency, order.efficiencyDeposit],
[phone, order.contactPhone],
];
const missing = [];
......@@ -4389,6 +4391,8 @@ class WanzhangguiOrderPage(TenantAuthPage):
"priceMode": price_mode,
"priceLabel": "百分比发单价" if price_mode == "percent" else "固定发单价",
"priceValue": price_value,
"securityDeposit": order.security_deposit,
"efficiencyDeposit": order.efficiency_deposit,
"serviceHours": order.service_hours,
"contactPhone": order.contact_phone,
},
......@@ -13186,6 +13190,29 @@ class WanyoujiFulfillmentPage(TenantAuthPage):
return last_text
return last_text
def verify_workshop_order_list_status(
self,
source_order_no: str,
order_title: str,
expected_statuses: list[str] | tuple[str, ...],
) -> str:
frame = self.open_workshop_order_list()
text = self.search_workshop_order_list(frame, source_order_no, order_title)
row_text = self.extract_order_row_text(text, source_order_no)
if not row_text and order_title:
row_text = self.extract_order_row_text(text, order_title)
target_text = row_text or text
assert source_order_no in target_text or order_title in target_text or source_order_no in text or order_title in text, (
f"丸友集订单列表未找到目标订单;source_order_no={source_order_no}; "
f"order_title={order_title}; text={text[:1500]}"
)
row_status = self.extract_workshop_order_row_status(target_text)
assert any(status in target_text or status == row_status for status in expected_statuses), (
f"丸友集订单列表状态不符合预期;source_order_no={source_order_no}; order_title={order_title}; "
f"expected_statuses={list(expected_statuses)}; row_status={row_status}; row_text={target_text[:1500]}"
)
return target_text
@staticmethod
def filtered_order_list_has_single_result(text: str) -> bool:
compact = re.sub(r"\s+", "", text or "")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment