fix(fulfillment): 使用真实订单号并支持协作单跳转
This commit is contained in:
@@ -491,7 +491,7 @@ class TestFulfillmentCollabSync(_Base):
|
||||
)
|
||||
|
||||
assert action == "created"
|
||||
assert order.order_no == f"PF{task.id}"
|
||||
assert order.order_no == task.platform_order_id
|
||||
assert order.source_type == "platform_fulfillment"
|
||||
assert order.source_task_id == task.id
|
||||
assert order.source_order_id == task.source_order_id
|
||||
@@ -559,6 +559,7 @@ class TestFulfillmentCollabSync(_Base):
|
||||
order.points_balance = 654
|
||||
order.points_check_message = "人工核账快照"
|
||||
order.remark = "客服人工备注"
|
||||
order.order_no = f"PF{task.id}"
|
||||
self.session.commit()
|
||||
|
||||
synced, action = collab.sync_platform_fulfillment_order(
|
||||
@@ -570,12 +571,40 @@ class TestFulfillmentCollabSync(_Base):
|
||||
assert action == "updated"
|
||||
assert self.session.query(DouyuExternalOrder).count() == 1
|
||||
assert synced.id == order.id
|
||||
assert synced.order_no == task.platform_order_id
|
||||
assert synced.owner_id == other_owner.id
|
||||
assert synced.fish_fin_balance == 321
|
||||
assert synced.points_balance == 654
|
||||
assert synced.points_check_message == "人工核账快照"
|
||||
assert synced.remark == "客服人工备注"
|
||||
|
||||
def test_manual_sync_links_existing_collab_order_with_real_order_no(self):
|
||||
task = self.task()
|
||||
manual = DouyuExternalOrder(
|
||||
order_no=task.platform_order_id,
|
||||
shop="人工先建单",
|
||||
owner_id=self.admin.id,
|
||||
remark="人工备注保留",
|
||||
status="to_recharge",
|
||||
created_by=self.admin.id,
|
||||
updated_by=self.admin.id,
|
||||
)
|
||||
self.session.add(manual)
|
||||
self.session.commit()
|
||||
|
||||
synced, action = collab.sync_platform_fulfillment_order(
|
||||
self.session,
|
||||
self.admin,
|
||||
task,
|
||||
)
|
||||
|
||||
assert action == "updated"
|
||||
assert synced.id == manual.id
|
||||
assert synced.order_no == task.platform_order_id
|
||||
assert synced.source_type == "platform_fulfillment"
|
||||
assert synced.source_task_id == task.id
|
||||
assert synced.remark == "人工备注保留"
|
||||
|
||||
def test_manual_sync_maps_only_safe_terminal_statuses(self):
|
||||
task = self._task_with_account()
|
||||
order, _ = collab.sync_platform_fulfillment_order(
|
||||
|
||||
Reference in New Issue
Block a user