Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5000,6 +5000,18 @@ class StoreOrderRepository extends BaseRepository
      */
     public function merchantGetList(array $where, $page, $limit, $is_excel = 0)
     {
+        if (!empty($where['zero_line_uid'])) {
+            $sql = "select getUserLevelId({$where['zero_line_uid']}) as uids";
+            //\think\facade\Log::info("lplpDB".$sql);
+            try {
+                $spread_user_list = Db::query($sql);
+            } catch (\Exception $exception) {
+                $spread_user_list = '';
+            }
+            $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
+            $where['uid'] = $spread_user_list;
+        }
+        unset($where['zero_line_uid']);
         $status = $where['status'];
         unset($where['status']);
         $query_search = $this->dao->search($where)

app/controller/admin/order/Order.php

@@ -63,7 +63,7 @@ class Order extends BaseController
     public function getAllList()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid']);
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid', 'zero_line_uid']);
 
         $pay_type=$this->request->param('pay_type');
         if($pay_type==1 || $pay_type==4){