commit

app/api/controller/user/UserController.php

@@ -890,6 +890,27 @@ class UserController
 
     }
 
+    /**
+     * 用户
+     * @return mixed
+     */
+    public function user_list(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['page', 0],
+            ['limit',10],
+            ['name', ''],
+        ]);
+        if ($data['name']){
+            $where[] = ['nickname|uid', '=', $data['name']];
+        }else{
+            $where = [];
+        }
+        $user = User::where('alliance', 1)->field('uid,nickname,avatar,phone')->where('uid', '<>', $request->uid())->where($where)->page($data['page'], $data['limit'])->select()->toArray();
+        $count = User::where('alliance', 1)->where('uid', '<>', $request->uid())->where($where)->count();
+        return app('json')->success(compact('user', 'count'));
+    }
+
     /**
      * 每月分红
      * @return void

app/models/store/StoreOrder.php

@@ -1176,11 +1176,16 @@ class StoreOrder extends BaseModel
         }else{
             $where[] = ['purchase', '<>', 1];
         }
-        if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid', $uid)
+        if ($purchase == 2){
+            $str = 'consignor';
+        }else{
+            $str = 'uid';
+        }
+        if ($page) $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where($str, $uid)
             ->where($where)
             ->field('add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type')
             ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();
-        else  $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where('uid', $uid)
+        else  $list = self::statusByWhere($status, $uid)->where('is_del', 0)->where($str, $uid)
             ->where($where)
             ->field('add_time,seckill_id,bargain_id,combination_id,id,order_id,pay_price,total_num,total_price,pay_postage,total_postage,paid,status,refund_status,pay_type,coupon_price,deduction_price,pink_id,delivery_type,is_del,shipping_type')
             ->order('add_time DESC')->page((int)$page, (int)$limit)->select()->toArray();

route/api/route.php

@@ -171,6 +171,9 @@ Route::group(function () {
     Route::post('user/purchase', 'user.UserController/purchase')->name('purchase');//进货
     Route::post('user/deliver_goods', 'user.UserController/deliver_goods')->name('deliver_goods');//发货
     Route::get('user/user_product', 'user.UserController/user_product')->name('user_product');//用户拥有商品
+
+    //发货用户
+    Route::get('user/user_list', 'user.UserController/user_list')->name('user_list');//发货用户
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {