【Fix】修复后台产品列表因为排序问题导致的分页ID重复问题，修复取消订单无法撤回积分的问题

app/Http/Controllers/Admin/Product.php

@@ -49,7 +49,7 @@ class Product extends Auth{
 		if( $startTime )		$map[] = ['insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
 		if( !is_null($status) )	$map[] = ['status','=',$status];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderBy('sort')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
+		$list					= $Model->query()->where($map)->orderBy('sort')->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// id转编号

app/Http/Controllers/Api/Orders.php

@@ -35,7 +35,7 @@ class Orders extends Api{
 		// 验证参数
 		$request->scene('create')->validate();
 		// 检查登录
-		$uid							= 2;//$this->checkLogin();
+		$uid							= $this->checkLogin();
 		// 接收参数
 		$isCart							= request('is_cart',0);
 		$productList					= request('product_list','[]');
@@ -369,7 +369,7 @@ class Orders extends Api{
 	}
 
 	/**
-	 * 取消
+	 * 取消				/api/orders/cancel
 	 * 
 	 * */
 	public function cancel( Request $request, Model $Model,OrdersProduct $OrdersProduct,CustomScore $CustomScore){
@@ -381,7 +381,7 @@ class Orders extends Api{
 		$id				= request('id',0);
 		$status			= 4;
 		// 获取产品和数量
-		$oldData 		= $Model->query()->where([['id','=',$id],['custom_uid','=',$uid]])->first($id,['id','order_score','custom_uid']);
+		$oldData 		= $Model->query()->where([['id','=',$id],['custom_uid','=',$uid]])->first(['id','order_score','custom_uid']);
 		// 如果用户不存在
 		if( !$oldData )	return json_send(['code'=>'error','msg'=>'订单不存在']);
 		// 组合数据，写入订单表，子表