【Mod】优惠券显示优化

app/Http/Controllers/Admin/Coupon.php

@@ -1,14 +1,10 @@
 <?php namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\Coupon as Request;
-use App\Models\AdminUser;
 use App\Models\Coupon as Model;
-use App\Models\CouponProduct;
 use App\Models\CouponRebate;
-use App\Models\Custom;
 use App\Models\CustomCoupon;
 use App\Models\Product;
-use App\Models\FilesManager;
 use Illuminate\Support\Facades\DB;
 use App\Models\City;
 
@@ -53,9 +49,15 @@ class Coupon extends Auth{
 		foreach ($list as $key => $value) {
 			// id转编号
 			$value['coupon_code']= $Model->idToCode($value['id']);
+			// 发放类型
 			$value['gant_name']  = $Model->getGrantType($value['grant_type'],'name');
-			// 如果过期时间
-			if( $value['end_time'] < time() ) $value['status'] = 3;
+			// 如果已经到了结束时间。活动结束
+			if( $value['status'] == 0 && $value['end_time'] <= time() ) {
+				// 状态设置
+				$Model->edit($value['id'],['status'=>3]);
+				// 状态设置
+				$value['status'] = 3;
+			}
 			// id转编号
 			$value['custom_total'] = isset($customTotal[$value['id']]) ? $customTotal[$value['id']] : 0;
 			// 重组
@@ -86,6 +88,7 @@ class Coupon extends Auth{
 			$data['end_time'] 		= request('end_time','');
 			$data['type_id']		= request('type_id',1);
 			$data['grant_type']		= request('grant_type',1);
+			$data['status']			= request('status',2);
 			$cityIds				= request('city_ids',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			// 转换时间，默认现在现在生效

app/Http/Controllers/Admin/CustomCoupon.php

@@ -4,7 +4,7 @@ use App\Models\Custom;
 use App\Models\CustomCoupon as Model;
 use App\Models\Coupon as Coupon;
 use App\Http\Requests\Admin\CustomCoupon as Request;
-use Illuminate\Support\Facades\DB;
+use App\Models\AdminUser;
 
 /**
  * 优惠券管理
@@ -24,7 +24,7 @@ class CustomCoupon extends Auth{
 	 * 首页列表
 	 * 
 	 * */
-    public function index(Model $Model,Coupon $Coupon,Custom $Custom){
+    public function index(Model $Model,Coupon $Coupon,Custom $Custom,AdminUser $AdminUser){
 		// 接受参数
 		$code					= request('coupon_code','');
 		$customCode				= request('custom_code','');
@@ -48,7 +48,7 @@ class CustomCoupon extends Auth{
 								->where($map)
 								->orderBy('custom_coupon.status')
 								->orderByDesc('custom_coupon.id')
-								->select(['custom_coupon.id','coupon.id as coupon_id','coupon.name as coupon_name','coupon.type_id','coupon.rebate_type','coupon.std_pay','coupon.rebate','custom_coupon.status','custom_coupon.custom_uid','custom_coupon.exp_time'])
+								->select(['custom_coupon.*','coupon.name as coupon_name','coupon.type_id','coupon.rebate_type','coupon.std_pay','coupon.rebate','custom_coupon.exp_time'])
 								->paginate(request('limit',config('page_num',10)))
 								->appends(request()->all());
 		// 循环处理数据
@@ -59,8 +59,10 @@ class CustomCoupon extends Auth{
 			$value['custom_code'] = $Custom->idToCode($value['custom_uid']);
 			// id转编号
 			$value['custom_name'] = $Custom->getValue($value['custom_uid'],'username');
+			// id转编号
+			$value['admin_name']  = $AdminUser->getOne($value['admin_uid'],'username');
 			// 如果过期时间
-			if( $value['status'] == 0 && ( $value['exp_time']>0 && $value['exp_time']< time() ) ) {
+			if( $value['status'] == 0 && $value['exp_time'] <= time() ) {
 				// 状态设置
 				$Model->edit($value['id'],['status'=>3]);
 				// 状态设置
@@ -127,7 +129,7 @@ class CustomCoupon extends Auth{
 				// 如果存在ID
 				if( $oldId )			continue;
 				// 批量写入列表
-				$insertList[]			= ['coupon_id'=>$couponId,'custom_uid'=>$value,'exp_time'=>$Coupon->getExpTime($couponInfo['exp_time']),'insert_time'=>$time,'update_time'=>$time];
+				$insertList[]			= ['coupon_id'=>$couponId,'custom_uid'=>$value,'exp_time'=>$Coupon->getExpTime($couponInfo['exp_time']),'admin_uid'=>admin('uid'),'insert_time'=>$time,'update_time'=>$time];
 			}
 			// 查询该优惠券已经发放的数量
 			$countTotal					= $Model->query()->where([['coupon_id','=',$couponId]])->count();

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

@@ -18,9 +18,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<div class="form-group col col-md-1" style="margin-right: 2px;">
 		<select name="status" class="form-control">
 			<option value="" >优惠券状态</option>
-			<option value="0" @if (request('status') === '0' ) selected="selected" @endif >正常</option>
-			<option value="2" @if (request('status') === '2' ) selected="selected" @endif >暂停</option>
-			<option value="3" @if (request('status') === '3' ) selected="selected" @endif >过期</option>
+			<option value="0" @if (request('status') === '0' ) selected="selected" @endif >启用</option>
+			<option value="2" @if (request('status') === '2' ) selected="selected" @endif >停用</option>
+			<option value="3" @if (request('status') === '3' ) selected="selected" @endif >结束</option>
 			<option value="4" @if (request('status') === '4' ) selected="selected" @endif >作废</option>
 		</select>
 	</div>
@@ -79,9 +79,16 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						</td>
 						<td> {{$a['gant_name']}} </td>
 						<td> 
-							@if ($a['status'] == 0) 正常 @endif
-							@if ($a['status'] == 2) 暂停 @endif
-							@if ($a['status'] == 3) 过期 @endif
+							@if ($a['status'] == 0) 
+
+								@if ( $a['start_time']  > time() ) 
+									待开始
+								@else
+									进行中
+								@endif
+							@endif
+							@if ($a['status'] == 2) 停用 @endif
+							@if ($a['status'] == 3) 结束 @endif
 							@if ($a['status'] == 4) 作废 @endif
 						</td>
 						<td> {{date('Y/m/d H:i',$a['start_time'])}} ~ {{date('Y/m/d H:i:s',$a['end_time'])}}</td>
@@ -103,12 +110,12 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							@if( check_auth('admin/coupon/set_status') )
 								@if ( $a['status'] == 2)
 									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/coupon/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-										开始
+										启用
 									</a>
 								@endif
 								@if( $a['status'] == 0)
 									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/coupon/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'2']))}}">
-										暂停
+										停用
 									</a>
 								@endif
 								@if ( $a['status'] < 3 )

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

@@ -56,6 +56,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>优惠券类型</th>
 						<th>优惠券状态</th>
 						<th>有效期限</th>
+						<th>操作人员</th>
 						<th>操作</th>
 					</tr>
 				</thead>
@@ -85,7 +86,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							@if ($a['status'] == 3) 过期 @endif
 							@if ($a['status'] == 4) 作废 @endif
 						</td>
-						<td> {{date('Y/m/d H:i:s',$a['exp_time'])}}</td>
+						<td> {{date('Y/m/d H:i:s',$a['insert_time'])}} ~ {{date('Y/m/d H:i:s',$a['exp_time'])}}</td>
+						<td> {{$a['admin_name']}}</td>
 						<td>
 							@if( check_auth('admin/custom_coupon/set_status') )
 								@if ( $a['status'] == 4 )