【Mod】优化下单抽奖，订单回执审核

app/Http/Controllers/Admin/LotteryOrderRecord.php

@@ -24,6 +24,8 @@ class LotteryOrderRecord extends Auth{
 	 * */
     public function index(Model $Model,LotteryOrder $LotteryOrder,Custom $Custom){
 		// 接受参数
+		// 接受参数
+		$lotteryId				= request('lottery_id',0);
 		$customCode				= request('custom_code','');
 		$startTime				= request('start_time','');
 		$endTime				= request('end_time','');
@@ -33,6 +35,7 @@ class LotteryOrderRecord extends Auth{
 		// 编码转ID
 		$customUid				= $customCode ? $Custom->codeToId($customCode) : 0;
 		if( $customUid )		$map[] = ['custom_uid','=',$customUid];
+		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $startTime )		$map[] = ['insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['insert_time','<=',strtotime($endTime)];
 		if( !is_null($status) )	$map[] = ['status','=',$status];

app/Http/Controllers/Admin/LotteryOrderReward.php

@@ -36,7 +36,7 @@ class LotteryOrderReward extends Auth{
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 获取类型名称
-			$value['reward_type'] = $Model->getRewardType($value['id'],'name');
+			$value['reward_type'] = $Model->getRewardType($value['reward_type'],'name');
 			// 重组
 			$list[$key]			= $value;
 		}

app/Http/Controllers/Admin/Orders.php

@@ -1,6 +1,7 @@
 <?php namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\Orders as Request;
+use App\Models\AdminUser;
 use App\Models\Custom;
 use App\Models\CustomAddr;
 use App\Models\CustomScore;
@@ -84,7 +85,7 @@ class Orders extends Auth{
 			$value['order_code']	= $Model->idToCode($value['order_id']);
 			$value['custom_code']	= $Custom->idToCode($value['custom_uid']);
 			$value['state']			= $Model->getState($value['status'],'state');
-			$value['product_code']	= $Product->idToCode($value['product_id']);
+			$value['product_code']	= $value['product_id'] ? $Product->idToCode($value['product_id']) : '— —';
 			// 重组
 			$list[$key]				= $value;
 		}
@@ -100,7 +101,7 @@ class Orders extends Auth{
 	 * 首页列表
 	 * 
 	 * */
-    public function detail(Model $Model,OrdersProduct $OrdersProduct,Product $Product,Custom $Custom,OrdersAddr $OrdersAddr,Receipt $Receipt){
+    public function detail(Model $Model,AdminUser $AdminUser,OrdersProduct $OrdersProduct,Product $Product,Custom $Custom,OrdersAddr $OrdersAddr,Receipt $Receipt){
 		// 接受参数
 		$id						= request('order_id','');
 		// 查询数据
@@ -125,11 +126,13 @@ class Orders extends Auth{
 		}
 		// 循环数据
 		foreach ($orderReceipt as $key => $value) {
+			// 操作人员
+			$value['admin_name']= $AdminUser->getOne($value['admin_uid'],'username');
 			$value['image']		= path_compat($value['image']);
 			$orderReceipt[$key] = $value;
 		}
 		// 积分
-		$score					= max(array_column($orderReceipt,'give_score'));
+		$score					= $orderReceipt ? max(array_column($orderReceipt,'give_score')) : 0;
 		// 恭喜
 		$shopName				= $orderAddr['contact_shop'] ? $orderAddr['contact_shop'] : $order['custom_name'];
 		// 结果
@@ -227,7 +230,7 @@ class Orders extends Auth{
 		// 当前时间
 		$time								= time();
 		// 循环表格数据
-		foreach ($sheetList as $value) {
+		foreach ($sheetList as $value) 		{
 			// 状态更改
 			$value['status']				= $Model->getWeibanStatus($value['status']);
 			// 客户手机号

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

@@ -29,7 +29,7 @@ class Receipt extends Api{
 		// 验证参数
 		$request->scene('apply')->validate();
 		// 检查登录
-		$uid							= 2;//$this->checkLogin();
+		$uid							= $this->checkLogin();
 		// 接收参数
 		$orderId						= request('order_id',0);
 		// 接收文件

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

@@ -72,7 +72,7 @@ class Orders extends Api{
 			// 重组数据
 			$value						= [
 											'status'=>$order['status'],
-											'product_name'=> str_ireplace('（'.$value['sku_value'].'）','',$value['product_name']),
+											'product_name'=> str_ireplace(['（）','()','（','('],'',str_ireplace($value['sku_value'],'',$value['product_name'])),
 											'sku_attr_names'=>$value['sku_value'],
 											'buy_num'=>$value['number'],
 											'pay_total'=>$value['sub_total'],

app/Models/FilesManager.php

@@ -194,7 +194,7 @@ class FilesManager extends Model
             if( !$order['product_name'] )       return ['error' => ($row + 1).' 行未识别到商品名称'];
             if( !$order['buy_num'] )            return ['error' => ($row + 1).' 行未识别到商品数量'];
             // 替换一下产品名称中的数据，避免数据超长
-            $order['product_name']              = str_ireplace('（'.$order['sku_attr_names'].'）','',$order['product_name']);
+            $order['product_name']              = str_ireplace(['（）','()','（','('],'',str_ireplace($order['sku_attr_names'],'',$order['product_name']));
             $order['insert_time']               = $order['insert_time'] ? intval(strtotime($order['insert_time'])) : '';
             // 如果不是第一条
             if( $row >= 1 )                     {

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

@@ -83,6 +83,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>提交时间</th>
 						<th>审核状态</th>
 						<th>备注</th>
+						<th>审核人员</th>
 						<th>修改时间</th>
 						<th>操作</th>
 					</tr>
@@ -92,6 +93,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{date('Y-m-d H:i:s',$a['insert_time'])}} </td>
 						<td> {{$a['status'] == 1 ? '通过': ( $a['status'] == 2?'不通过':'待审核')}} </td>
 						<td> {{$a['remark']}} </td>
+						<td> {{$a['admin_name']}} </td>
 						<td> {{date('Y-m-d H:i:s',$a['update_time'])}} </td>
 						<td> 
 							@if( !$a['status'] )

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

@@ -38,6 +38,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<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') === '9' ) selected="selected" @endif >回执审核</option>
 			<option value="8" @if ( request('status') === '8' ) selected="selected" @endif >已完成</option>
 			<option value="4" @if ( request('status') === '4' ) selected="selected" @endif >已取消</option>
 		</select>
@@ -97,9 +98,15 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td>{{date('Y-m-d H:i:s',$a['insert_time'])}}</td>
 						<td>
 							@if( check_auth('admin/orders/detail') )
-							<a class="btn btn-sm btn-primary" href="{{url('admin/orders/detail?'.http_build_query(['order_id'=>$a['order_id']]))}}" title="查看">
-								{{$a['status']==9?'审核':'查看'}}
-							</a>
+								@if( $a['status']==9 )
+									<a class="btn btn-sm btn-success" href="{{url('admin/orders/detail?'.http_build_query(['order_id'=>$a['order_id']]))}}" title="审核">
+										审核
+									</a>
+								@else
+									<a class="btn btn-sm btn-primary" href="{{url('admin/orders/detail?'.http_build_query(['order_id'=>$a['order_id']]))}}" title="查看">
+										查看
+									</a>
+								@endif
 							@endif
 							@if( $a['status'] == 1 && check_auth('admin/orders/set_status') )
 							<a class="delete btn btn-sm btn-danger " data-url="{{url('admin/orders/set_status?'.http_build_query(['id'=>$a['order_id'],'status'=>4]))}}" title="取消">