订单排序

app-hd/controllers/OrderController.php

@@ -30,6 +30,24 @@ class OrderController extends BaseController
 
     public $guestAccess = ['order-relate', 'fast-pay', 'create-order', 'list'];
 
+    //发货
+    public function actionSend()
+    {
+        $get = Yii::$app->request->get();
+        $id = isset($get['id']) ? $get['id'] : 0;
+        $order = OrderClass::getById($id, true);
+        if (empty($order)) {
+            util::fail('没有找到订单');
+        }
+        OrderClass::valid($order, $this->mainId);
+        if ($order->status != 2) {
+            util::fail('订单不是待发货状态，请刷新');
+        }
+        $order->status = 4;
+        $order->save();
+        util::complete('操作成功');
+    }
+
     //打印订单 ssh 20220601
     public function actionPrintOrder()
     {
@@ -794,6 +812,12 @@ class OrderController extends BaseController
         if (!empty($status)) {
             $where['status'] = $get['status'];
         }
+        if (isset($get['shopAdminId']) && !empty($get['shopAdminId'])) {
+            $where['shopAdminId'] = $get['shopAdminId'];
+        }
+        if (isset($get['sendNum']) && !empty($get['sendNum'])) {
+            $where['sendNum'] = $get['sendNum'];
+        }
         if (!empty($search)) {
             if (stringUtil::isMobile($search)) {
                 $where['bookMobile'] = $search;

biz-hd/order/services/OrderService.php

@@ -316,7 +316,12 @@ class OrderService extends BaseService
     //获取订单信息 ssh 2019.11.28
     public static function getOrderList($where)
     {
-        $data = self::getList('*', $where, 'addTime DESC');
+        $order = 'addTime DESC';
+        if (isset($where['status']) && $where['status'] == 2) {
+            $order = 'reachDate ASC,reachPeriod ASC,addTime ASC';
+        }
+
+        $data = self::getList('*', $where, $order);
         if (isset($data['list']) == false || empty($data['list'])) {
             return $data;
         }