【Add】收货地址增加店铺名称

app/Http/Controllers/Admin/Orders.php

@@ -66,7 +66,7 @@ class Orders extends Auth{
 									->orderByDesc('id')
 									->select([
 										'orders_product.*','custom.username as custom_name',
-										'orders_addr.contact_name','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
+										'orders_addr.contact_name','orders_addr.contact_shop','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
 									])
 									->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 循环处理数据
@@ -247,7 +247,7 @@ class Orders extends Auth{
 									->select([
 										'orders_product.id as id','orders_product.order_id','orders_product.custom_uid','orders_product.product_name','orders_product.sku_attr_names as product_spec','orders_product.product_thumb','orders_product.buy_num','orders_product.pay_total','orders_product.status','orders_product.insert_time',
 										'custom.username as custom_name','custom.weiban_extid as weiban_extid',
-										'orders_addr.contact_name','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
+										'orders_addr.contact_name','orders_addr.contact_shop','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
 									])->get()->toArray();
 		// 返回结果
 		$data						= [];
@@ -271,7 +271,7 @@ class Orders extends Auth{
 			$data[$value['order_id']]['contact_province'] = $value['contact_province'];
 			$data[$value['order_id']]['contact_city'] = $value['contact_city'];
 			$data[$value['order_id']]['contact_area'] = $value['contact_area'];
-			$data[$value['order_id']]['contact_addr'] = $value['contact_addr'];
+			$data[$value['order_id']]['contact_addr'] = $value['contact_addr'] .($value['contact_shop'] ? '【'.$value['contact_shop'].'】' : '');
 			// 子订单
 			$data[$value['order_id']]['product'][] 	  = ['product_name'=>$value['product_name'],'product_spec'=>$value['product_spec'],'product_thumb'=>$value['product_thumb'],'product_price'=>$value['product_price'],'buy_num'=>$value['buy_num'],'pay_total'=>$value['pay_total']];
 		}

app/Http/Controllers/Admin/ScoreOrders.php

@@ -45,9 +45,14 @@ class ScoreOrders extends Auth{
 		if( !is_null($status) )	$map[] = ['score_orders.status','=',$status];
 		// 查询数据
 		$list					= $Model->query()->join('score_product','score_orders.product_id','=','score_product.id')
+									->join('score_orders_addr','score_orders_addr.order_id','=','score_orders.id')
 									->where($map)
 									->orderByDesc('score_orders.id')
-									->select(['score_orders.*','score_product.name as product_name'])
+									->select([
+										'score_orders.*',
+										'score_product.name as product_name',
+										'score_orders_addr.contact_name','score_orders_addr.contact_shop','score_orders_addr.contact_phone','score_orders_addr.contact_province','score_orders_addr.contact_city','score_orders_addr.contact_area','score_orders_addr.contact_addr'
+									])
 									->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {

app/Http/Controllers/Api/CustomAddr.php

@@ -50,6 +50,7 @@ class CustomAddr extends Api{
 		$data['contact_area']			= request('contact_area','');
 		$data['contact_addr']			= request('contact_addr','');
 		$data['contact_name']			= request('contact_name','');
+		$data['contact_shop']			= request('contact_shop','');
 		$data['contact_phone']			= request('contact_phone','');
 		$data['is_default']				= request('is_default',0);
 		$data['custom_uid']				= $uid;
@@ -91,6 +92,7 @@ class CustomAddr extends Api{
 		$data['contact_area']			= request('contact_area','');
 		$data['contact_addr']			= request('contact_addr','');
 		$data['contact_name']			= request('contact_name','');
+		$data['contact_shop']			= request('contact_shop','');
 		$data['contact_phone']			= request('contact_phone','');
 		$data['is_default']				= request('is_default',0);
 		// 替换地址中间的空格

app/Http/Controllers/Api/Orders.php

@@ -43,7 +43,7 @@ class Orders extends Api{
 		// 如果不存在数据
 		if( !$addr )					return json_send(['code'=>'error','msg'=>'地址有误，请核对','data'=>['error'=>'没有找到对应的地址']]);
 		// 重组数据
-		$addr							= ['contact_name'=>$addr['contact_name'],'contact_phone'=>$addr['contact_phone'],'contact_province'=>$addr['contact_province'],'contact_city'=>$addr['contact_city'],'contact_area'=>$addr['contact_area'],'contact_addr'=>$addr['contact_addr']];
+		$addr							= ['contact_name'=>$addr['contact_name'],'contact_shop'=>$addr['contact_shop'],'contact_phone'=>$addr['contact_phone'],'contact_province'=>$addr['contact_province'],'contact_city'=>$addr['contact_city'],'contact_area'=>$addr['contact_area'],'contact_addr'=>$addr['contact_addr']];
 		// 解码购买信息
 		$buyList						= json_decode($productList,true);
 		// 如果不存在数据

app/Http/Controllers/Api/Score/Orders.php

@@ -42,7 +42,7 @@ class Orders extends Api{
 		// 如果不存在数据
 		if( !$addr )					return json_send(['code'=>'error','msg'=>'地址有误，请核对','data'=>['error'=>'没有找到对应的地址']]);
 		// 重组数据
-		$addr							= ['contact_name'=>$addr['contact_name'],'contact_phone'=>$addr['contact_phone'],'contact_province'=>$addr['contact_province'],'contact_city'=>$addr['contact_city'],'contact_area'=>$addr['contact_area'],'contact_addr'=>$addr['contact_addr']];
+		$addr							= ['contact_name'=>$addr['contact_name'],'contact_shop'=>$addr['contact_shop'],'contact_phone'=>$addr['contact_phone'],'contact_province'=>$addr['contact_province'],'contact_city'=>$addr['contact_city'],'contact_area'=>$addr['contact_area'],'contact_addr'=>$addr['contact_addr']];
 		// 解码
 		$productList					= $Product->getOne($productId);
 		// 如果产品不存在

app/Models/CustomAddr.php

@@ -66,7 +66,7 @@ class CustomAddr extends Model
      */
     public function getOne($id,$field=''){
         // 返回结果
-        $result     = $field ? $this->query()->where([['id','=',$id]])->value($field) : $this->query()->where([['id','=',$id]])->first(['id','custom_uid','contact_province','contact_city','contact_area','contact_addr','contact_name','contact_phone','is_default']);
+        $result     = $field ? $this->query()->where([['id','=',$id]])->value($field) : $this->query()->where([['id','=',$id]])->first(['id','custom_uid','contact_province','contact_city','contact_area','contact_addr','contact_name','contact_shop','contact_phone','is_default']);
         // 返回结果
         return      $result;
     }
@@ -77,7 +77,7 @@ class CustomAddr extends Model
      */
     public function getListByCustom($uid){
         // 返回结果
-        $result     = $this->query()->where([['custom_uid','=',$uid]])->get(['id','custom_uid','contact_province','contact_city','contact_area','contact_addr','contact_name','contact_phone','is_default']);
+        $result     = $this->query()->where([['custom_uid','=',$uid]])->get(['id','custom_uid','contact_province','contact_city','contact_area','contact_addr','contact_name','contact_shop','contact_phone','is_default']);
         // 返回结果
         return      $result;
     }

resources/views/admin/orders/index.blade.php

@@ -83,7 +83,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td>￥{{$a['pay_total']}}</td>
 						<td>{{$a['contact_name']}}</td>
 						<td>{{$a['contact_phone']}}</td>
-						<td>{{$a['contact_province']}}/{{$a['contact_city']}}/{{$a['contact_area']}}/{{$a['contact_addr']}}</td>
+						<td>{{$a['contact_province']}}/{{$a['contact_city']}}/{{$a['contact_area']}}/{{$a['contact_addr']}} {{$a['contact_shop']}}</td>
 						<td>{{$a['state']}}</td>
 						<td>{{date('Y-m-d H:i:s',$a['insert_time']??0)}}</td>
 						<td>

resources/views/admin/score_orders/index.blade.php

@@ -41,6 +41,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>产品名称</th>
 						<th>产品数量</th>
 						<th>成交积分</th>
+						<th>收货人</th>
+						<th>联系方式</th>
+						<th>收货地址</th>
 						<th>订单状态</th>
 						<th>下单时间</th>
 						<th>操作</th>
@@ -55,6 +58,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td>{{$a['product_name']}}</td>
 						<td>{{$a['buy_num']}}</td>
 						<td>{{$a['score_total']}} 积分</td>
+						<td>{{$a['contact_name']}}</td>
+						<td>{{$a['contact_phone']}}</td>
+						<td>{{$a['contact_province']}}/{{$a['contact_city']}}/{{$a['contact_area']}}/{{$a['contact_addr']}}  {{$a['contact_shop']}}</td>
 						<td>{{$a['state']}}</td>
 						<td>{{date('Y-m-d H:i:s',$a['insert_time']??0)}}</td>
 						<td>

routes/api.php

@@ -110,4 +110,7 @@ Route::any('custom/set_city',[\App\Http\Controllers\Api\Custom::class,'set_city'
 
 
 // 首页Banner
-Route::any('banner/get_list',[\App\Http\Controllers\Api\Banner::class,'get_list']);
+Route::any('banner/get_list',[\App\Http\Controllers\Api\Banner::class,'get_list']);
+
+// 客服二维码
+Route::any('weiban_qrcode/get_qrcode',[\App\Http\Controllers\Api\WeiBanQrcode::class,'get_qrcode']);