|
|
@@ -45,10 +45,9 @@ class OrderSendClass extends BaseClass
|
|
|
//当前待执行的动作 shish 2019.12.16
|
|
|
public static function toDoActionId($id)
|
|
|
{
|
|
|
- $list = self::sendDetail($id);
|
|
|
+ $action = self::getByCondition(['orderId'=>$id],false,'inTurn DESC');
|
|
|
$actionId = 0;
|
|
|
- if (!empty($list)) {
|
|
|
- $action = current($list);
|
|
|
+ if (!empty($action['finishTime'])) {
|
|
|
$actionId = $action['actionId'];
|
|
|
}
|
|
|
return $actionId;
|