feat(order): 下单支持一口价/师傅报价竞价/用户自主定价三种方式
- 下单页新增计价方式选择;自主定价填写总价,师傅报价单进入报价大厅 - 用户订单详情展示师傅报价列表并可选定师傅;选定后同步师傅、金额与订单状态 - 师傅大厅新增用户定价筛选与按价接单;报价单禁止直接抢单 - 后端订单新增 custom 价态、金额口径统一由 calcAmount 输出 - 报价中状态纳入用户可取消范围;超时回流重新开放报价 - 新增 fa_order.price_type custom 枚举迁移脚本(schema_phase6)
这个提交包含在:
@@ -37,7 +37,7 @@ class OrderStatus
|
||||
|
||||
/** 合法流转:from => [to, to, ...] */
|
||||
protected static $transitions = [
|
||||
self::PENDING_PAY => [self::PENDING_ACCEPT, self::CANCELLED],
|
||||
self::PENDING_PAY => [self::PENDING_ACCEPT, self::QUOTING, self::CANCELLED],
|
||||
self::PENDING_ACCEPT => [self::QUOTING, self::ACCEPTED, self::CANCELLED],
|
||||
self::QUOTING => [self::ACCEPTED, self::CANCELLED],
|
||||
self::ACCEPTED => [self::SCHEDULED, self::ARRIVED, self::PENDING_ACCEPT, self::CANCELLED],
|
||||
@@ -140,6 +140,6 @@ class OrderStatus
|
||||
*/
|
||||
public static function canCancelByUser($status)
|
||||
{
|
||||
return in_array((int)$status, [self::PENDING_PAY, self::PENDING_ACCEPT, self::ACCEPTED, self::SCHEDULED], true);
|
||||
return in_array((int)$status, [self::PENDING_PAY, self::PENDING_ACCEPT, self::QUOTING, self::ACCEPTED, self::SCHEDULED], true);
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户