Accept Merge Request #216: (feature/hant -> develop)
Merge Request: 自动派单 Created By: @todayswind Accepted By: @todayswind URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/216?initial=true
This commit is contained in:
commit
5b2e1542cc
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace app\admin\controller\orders;
|
namespace app\admin\controller\orders;
|
||||||
|
|
||||||
|
use app\admin\model\Item;
|
||||||
use app\admin\model\Order;
|
use app\admin\model\Order;
|
||||||
use app\admin\model\OrderDispatch;
|
use app\admin\model\OrderDispatch;
|
||||||
use app\admin\model\OrderReview;
|
use app\admin\model\OrderReview;
|
||||||
|
|
@ -38,7 +39,7 @@ ORDER BY distance;",[$order->lng,$order->lat]);
|
||||||
|
|
||||||
$worker_ids = array_column($worker_info,'id');
|
$worker_ids = array_column($worker_info,'id');
|
||||||
|
|
||||||
$items = model('item')->getAll();
|
$items = Item::all();
|
||||||
$ids = $this->getParentIdsFromArray($order->item_id,$items);
|
$ids = $this->getParentIdsFromArray($order->item_id,$items);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user