按片区排列的订单列表更新

biz-ghs/order/classes/OrderClass.php

@@ -1411,7 +1411,7 @@ class OrderClass extends BaseClass
         $query = $model->conditionQuery($where)
             ->alias('o')
             ->leftJoin(['c' => Custom::tableName()], 'c.id = o.customId')
-            ->select(['o.id', 'o.mainId', 'o.customId', 'o.customName', 'o.customAvatar', 'o.fullAddress', 'c.name', 'c.mobile', 'c.distId', 'distId' => 'c.distId']);
+            ->select(['o.id', 'o.mainId', 'o.customId', 'o.customName', 'o.customAvatar', 'o.fullAddress', 'o.remark', 'c.name', 'c.mobile', 'c.distId', 'distId' => 'c.distId']);
 
         // $clone = clone $query;
         // $count = intval($clone->count('o.id'));
@@ -1437,7 +1437,7 @@ class OrderClass extends BaseClass
                     'list' => [],
                 ];
             }
-            $grouped[$distId]['list'][] = $orderInfo;
+            $grouped[$distId]['list'][$orderInfo['customId']][] = $orderInfo;
         }
 
         return [