修改订单下载 订单筛选

app/Http/Controllers/Admin/Custom.php

@@ -7,6 +7,7 @@ use App\Models\CustomAddr;
 use App\Models\CustomScore;
 use Illuminate\Support\Carbon;
 use App\Models\WeiBan\Follow as WeiBanFollow;
+use App\Models\Work\User as WorkUser;
 use App\Models\FilesManager;
 use App\Models\WeiBan\External as WeiBanExternal;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
@@ -33,7 +34,7 @@ class Custom extends Auth{
 	 * 列表页
 	 * 
 	 * */
-    public function index(Model $Model,CustomScore $CustomScore,WeiBanFollow $WeiBanFollow,City $City){
+    public function index(Model $Model,CustomScore $CustomScore,WeiBanFollow $WeiBanFollow,City $City,WorkUser $WorkUser){
  		// 接受参数
 		$code					= request('custom_code','');
 		$phone					= request('phone','');
@@ -68,7 +69,7 @@ class Custom extends Auth{
 			// 如果不存在微伴ID
 			if( !$value['external_userid'] )	{
 				// 通过手机号查询注册的账号
-				$value['external_userid'] 	= (string) $WeiBanFollow->query()->where([['phone_number','=',$value['phone']]])->value('external_userid');
+				$value['external_userid'] 	= (string) $WorkUser->query()->where([['remark_mobiles','=',$value['phone']]])->value('external_userid');
 				// 如果存在的话，修正
 				if( $value['external_userid'] ) $Model->edit($value['uid'],['external_userid'=>$value['external_userid']]);
 			}

app/Http/Controllers/Admin/Orders.php

@@ -47,10 +47,10 @@ class Orders extends Auth{
 		$productCode			= request('product_code','');
 		$phone					= request('phone','');
 		$customCode				= request('custom_code','');
-		$productName			= request('product_name','');
-		$province				= request('contact_province','');
-		$city					= request('contact_city','');
-		$area					= request('contact_area','');
+		$contact_area			= request('contact_area','');
+		$contact_school			= request('contact_school','');
+		$contact_grade			= request('contact_grade','');
+		$contact_class			= request('contact_class','');
 		$status					= request('status',0);
 		$startTime				= request('start_time','');
 		$endTime				= request('end_time','');
@@ -61,16 +61,17 @@ class Orders extends Auth{
 		// 查询条件
 		$map 					= [];
 		// 编码ID
-		if( $id )				$map[] = ['orders_product.order_id','=',$id];
+		if( $id )				$map[] = ['orders.id','=',$id];
 		// 编码ID
 		if( $orders_other )		$map[] = $orders_other == 1 ? ['orders_product.product_id','>',0] : ['orders_product.product_id','=',0];
 		if( $uid )				$map[] = ['custom.uid','=',$uid];
 		/*if( $productId )		$map[] = ['orders_product.product_id','=',$productId];
 		if( $productName )		$map[] = ['orders_product.product_name','LIKE','%'.$productName.'%'];*/
 		if( $phone )			$map[] = ['orders_addr.contact_phone','=',$phone];
-		if( $province )			$map[] = ['orders_addr.contact_province','LIKE','%'.$province.'%'];
-		if( $city )				$map[] = ['orders_addr.contact_city','LIKE','%'.$city.'%'];
-		if( $area )				$map[] = ['orders_addr.contact_area','LIKE','%'.$area.'%'];
+		if( $contact_area )		$map[] = ['orders_addr.contact_area','LIKE','%'.$contact_area.'%'];
+		if( $contact_school )	$map[] = ['orders_addr.contact_school','LIKE','%'.$contact_school.'%'];
+		if( $contact_grade )	$map[] = ['orders_addr.contact_grade','LIKE','%'.$contact_grade.'%'];
+		if( $contact_class )	$map[] = ['orders_addr.contact_class','LIKE','%'.$contact_class.'%'];
 		if( $startTime )		$map[] = ['orders.insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['orders.insert_time','<=',strtotime($endTime)];
 		if( $status )			$map[] = ['orders.status','=',$status];
@@ -401,9 +402,10 @@ class Orders extends Auth{
 		$customCode				= request('custom_code','');
 		$productName			= request('product_name','');
 		$phone					= request('phone','');
-		$province				= request('contact_province','');
-		$city					= request('contact_city','');
-		$area					= request('contact_area','');
+        $contact_area			= request('contact_area','');
+        $contact_school			= request('contact_school','');
+        $contact_grade			= request('contact_grade','');
+        $contact_class			= request('contact_class','');
 		$status					= request('status',0);
 		$startTime				= request('start_time','');
 		$endTime				= request('end_time','');
@@ -421,9 +423,10 @@ class Orders extends Auth{
 		if( $productId )		$map[] = ['orders_product.product_id','=',$productId];
 		if( $productName )		$map[] = ['orders_product.product_name','=',$productName];
 		if( $phone )			$map[] = ['orders_addr.contact_phone','=',$phone];
-		if( $province )			$map[] = ['orders_addr.contact_province','LIKE','%'.$province.'%'];
-		if( $city )				$map[] = ['orders_addr.contact_city','LIKE','%'.$city.'%'];
-		if( $area )				$map[] = ['orders_addr.contact_area','LIKE','%'.$area.'%'];
+        if( $contact_area )		$map[] = ['orders_addr.contact_area','LIKE','%'.$contact_area.'%'];
+        if( $contact_school )	$map[] = ['orders_addr.contact_school','LIKE','%'.$contact_school.'%'];
+        if( $contact_grade )	$map[] = ['orders_addr.contact_grade','LIKE','%'.$contact_grade.'%'];
+        if( $contact_class )	$map[] = ['orders_addr.contact_class','LIKE','%'.$contact_class.'%'];
 		if( $startTime )		$map[] = ['orders_product.insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['orders_product.insert_time','<=',strtotime($endTime)];
 		if( $status )			$map[] = ['orders_product.status','=',$status];
@@ -448,7 +451,7 @@ class Orders extends Auth{
 										'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_shop','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
+										'orders_addr.contact_area','orders_addr.contact_school','orders_addr.contact_grade','orders_addr.contact_class','orders_addr.contact_name','orders_addr.contact_phone',
 									])->get()->toArray();
 		// 返回结果
 		$data						= [];
@@ -470,10 +473,10 @@ class Orders extends Auth{
 			// 地址
 			$data[$value['order_id']]['contact_name'] = $value['contact_name'];
 			$data[$value['order_id']]['contact_phone'] = $value['contact_phone'];
-			$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'] .($value['contact_shop'] ? '【'.$value['contact_shop'].'】' : '');
+			$data[$value['order_id']]['contact_school'] = $value['contact_school'];
+			$data[$value['order_id']]['contact_grade'] = $value['contact_grade'];
+			$data[$value['order_id']]['contact_class'] = $value['contact_class'];
 			// 子订单
 			$data[$value['order_id']]['product'][] 	  = ['product_id'=>$value['product_id'] ? $Product->idToCode($value['product_id']) : '— —','product_name'=>$value['product_name'],'product_spec'=>$value['product_spec'],'product_thumb'=>$value['product_thumb'],'product_price'=>$value['product_price'],'pay_price'=>$value['pay_price'],'buy_num'=>$value['buy_num'],'pay_total'=>$value['pay_total'],'price_total'=>$value['price_total'],'coupon_total'=>$value['coupon_total']];
 		}
@@ -526,10 +529,10 @@ class Orders extends Auth{
 			$sheet->setCellValue('D'.$row, $value['status']);
 			$sheet->setCellValue('E'.$row, $value['contact_name']);
 			$sheet->setCellValue('F'.$row, $value['contact_phone']);
-			$sheet->setCellValue('G'.$row, $value['contact_province']);
-			$sheet->setCellValue('H'.$row, $value['contact_city']);
-			$sheet->setCellValue('I'.$row, $value['contact_area']);
-			$sheet->setCellValue('J'.$row, $value['contact_addr']);
+			$sheet->setCellValue('G'.$row, $value['contact_area']);
+			$sheet->setCellValue('H'.$row, $value['contact_school']);
+			$sheet->setCellValue('I'.$row, $value['contact_grade']);
+			$sheet->setCellValue('J'.$row, $value['contact_class']);
 			$sheet->setCellValue('S'.$row, $value['weiban_extid']);
 			$sheet->setCellValue('T'.$row, date('Y-m-d H:i:s',$value['insert_time']));
 			// 循环产品
@@ -598,10 +601,10 @@ class Orders extends Auth{
 		->setCellValue('D1', '订单状态')
 		->setCellValue('E1', '收货人')
 		->setCellValue('F1', '收货人手机号')
-		->setCellValue('G1', '省')
-		->setCellValue('H1', '市')
-		->setCellValue('I1', '区县')
-		->setCellValue('J1', '收货地址')
+		->setCellValue('G1', '区域')
+		->setCellValue('H1', '学校')
+		->setCellValue('I1', '年级')
+		->setCellValue('J1', '班级')
 		->setCellValue('K1', '产品编码')
 		->setCellValue('L1', '产品名称')
 		->setCellValue('M1', '产品规格')

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

@@ -26,28 +26,25 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<input type="text" class="form-control" name="phone" value="{{request('phone','')}}" placeholder="请输入收件人号码查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="product_code" value="{{request('product_code','')}}" placeholder="请输入产品编码查询" />
+		<input type="text" class="form-control" name="contact_area" value="{{request('contact_area','')}}" placeholder="请输入区域查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="product_name" value="{{request('product_name','')}}" placeholder="请输入产品名称查询" />
+		<input type="text" class="form-control" name="contact_school" value="{{request('contact_school','')}}" placeholder="请输入学校查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="contact_province" value="{{request('contact_province','')}}" placeholder="请输入省份查询" />
+		<input type="text" class="form-control" name="contact_grade" value="{{request('contact_grade','')}}" placeholder="请输入年级查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="contact_city" value="{{request('contact_city','')}}" placeholder="请输入城市查询" />
-	</div>
-	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<input type="text" class="form-control" name="contact_area" value="{{request('contact_area','')}}" placeholder="请输入区县查询" />
+		<input type="text" class="form-control" name="contact_class" value="{{request('contact_class','')}}" placeholder="请输入班级查询" />
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="status" class="form-control">
 			<option value="" >订单状态</option>
 			<option value="1" @if ( request('status') === '1' ) selected="selected" @endif >待支付</option>
-			<option value="9" @if ( request('status') === '2' ) selected="selected" @endif >已支付</option>
+			<option value="2" @if ( request('status') === '2' ) selected="selected" @endif >已付款</option>
 			<option value="4" @if ( request('status') === '4' ) selected="selected" @endif >已取消</option>
-			<option value="8" @if ( request('status') === '5' ) selected="selected" @endif >退款中</option>
-			<option value="8" @if ( request('status') === '6' ) selected="selected" @endif >已退款</option>
+			<option value="5" @if ( request('status') === '5' ) selected="selected" @endif >退款中</option>
+			<option value="6" @if ( request('status') === '6' ) selected="selected" @endif >已退款</option>
 		</select>
 	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">