【Mod】修改下单抽奖逻辑

app/Http/Controllers/Admin/LotteryOrder.php

@@ -195,6 +195,7 @@ class LotteryOrder extends Auth{
 			$tagScope				= request('tag_scope',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			$data['tag_scope']		= implode(',',$tagScope);
+			$data['status']			= 1;
 			// 写入数据表
 			$result					= $Model->edit($id,$data);
 			// 如果操作失败
@@ -245,9 +246,9 @@ class LotteryOrder extends Auth{
 		// 如果设置上架
 		if( !$status )	{
 			// 判断奖品个数
-			$count		= $OrderReward->query()->where([['lottery_id','=',$id]])->count();
+			$count		= count($OrderReward->getListByLottery($id));
 			// 获取统计数量
-			if( $count < 3 || $count > 7 ) return json_send(['code'=>'error','msg'=>'奖项请设置3~7个再启用']);
+			if( $count < 4 || $count > 8 ) return json_send(['code'=>'error','msg'=>'奖项请设置4~8个再启用']);
 		}
 		// 执行修改
 		$result			= $Model->edit($id,['status'=>$status]);

app/Http/Controllers/Admin/LotteryOrderReward.php

@@ -29,12 +29,21 @@ class LotteryOrderReward extends Auth{
 		// 查询条件
 		$map 					= [];
 		// 组合条件
-		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
+		$map[]					= ['lottery_id','=',$lotteryId];
 		if( $name )				$map[] = ['reward_name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
+		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
+		// 总奖品份数
+		$total					= 0;
+		// 处理数据
+		foreach ($list as $key => $value) {
+			// 查询奖品总份数
+			if( !$value['status'] ) $total += $value['reward_all'];
+		}
 		// 循环处理数据
 		foreach ($list as $key => $value) {
+			// 中奖概率，如果不存在的话
+			$value['probability'] = $value['status'] ? 0 : ($total ? round($value['reward_all'] / $total * 100,2) : 0);
 			// 获取类型名称
 			$value['reward_type'] = $Model->getRewardType($value['reward_type'],'name');
 			// 重组
@@ -63,14 +72,15 @@ class LotteryOrderReward extends Auth{
 			$data['reward_thumb']	= request('reward_thumb','');
 			$data['reward_type']	= request('reward_type',0);
 			$data['reward_total']	= request('reward_total',0);
+			$data['reward_all']		= request('reward_all',0);
 			$data['reward_info']	= request('reward_info','');
-			$data['probability']	= request('probability',0);
+			// $data['probability']	= request('probability',0);
 			$data['lottery_id']		= request('lottery_id',0);
 			$data['status']			= 1;
 			// 计算统计数量
 			$count					= $Model->query()->where([['lottery_id','=',$data['lottery_id']]])->count();
 			// 获取统计数量
-			if( $count >= 7 )		return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
+			if( $count >= 8 )		return json_send(['code'=>'error','msg'=>'奖项不可超过8个']);
 			// 如果是积分，转整数
 			if( $data['reward_type'] == 1 )  {
 				// 
@@ -86,7 +96,12 @@ class LotteryOrderReward extends Auth{
 				if( !$data['reward_info']  ) return json_send(['code'=>'error','msg'=>'请填写正确的优惠券编码']);
 			}
 			// 如果是红包
-			if( $data['reward_type'] == 3 )  $data['reward_info'] = number_format(floatval($data['reward_info']),2,'.','');
+			if( $data['reward_type'] == 3 )  {
+				// 如果操作失败
+				if( !$data['reward_info']  ) return json_send(['code'=>'error','msg'=>'请填写红包金额']);
+				// 填写
+				$data['reward_info'] = number_format(floatval($data['reward_info']),2,'.','');
+			}
 			// 写入数据表
 			$id						= $Model->add($data);
 			// 如果操作失败
@@ -131,13 +146,14 @@ class LotteryOrderReward extends Auth{
 			$data['reward_thumb']	= request('reward_thumb','');
 			$data['reward_type']	= request('reward_type',0);
 			$data['reward_total']	= request('reward_total',0);
+			$data['reward_all']		= request('reward_all',0);
 			$data['reward_info']	= request('reward_info','');
-			$data['probability']	= request('probability',0);
+			// $data['probability']	= request('probability',0);
 			$data['lottery_id']		= request('lottery_id',0);
 			// 计算统计数量
 			$count					= $Model->query()->where([['lottery_id','=',$data['lottery_id']],['id','<>',$id]])->count();
 			// 获取统计数量
-			if( $count >= 7 )		return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
+			if( $count >= 8 )		return json_send(['code'=>'error','msg'=>'奖项不可超过8个']);
 			// 如果是积分，转整数
 			if( $data['reward_type'] == 1 )  {
 				// 
@@ -153,7 +169,12 @@ class LotteryOrderReward extends Auth{
 				if( !$data['reward_info']  ) return json_send(['code'=>'error','msg'=>'请填写正确的优惠券编码']);
 			}
 			// 如果是红包
-			if( $data['reward_type'] == 3 )  $data['reward_info'] = number_format(floatval($data['reward_info']),2,'.','');
+			if( $data['reward_type'] == 3 )  {
+				// 如果操作失败
+				if( !$data['reward_info']  ) return json_send(['code'=>'error','msg'=>'请填写红包金额']);
+				// 填写
+				$data['reward_info'] = number_format(floatval($data['reward_info']),2,'.','');
+			}
 			// 写入数据表
 			$result					= $Model->edit($id,$data);
 			// 如果操作失败
@@ -196,7 +217,7 @@ class LotteryOrderReward extends Auth{
 		// 如果用户不存在
 		if( !$oldData )	return json_send(['code'=>'error','msg'=>'数据不存在']);
 		// 执行修改
-		$result			= $Model->edit($id,['status'=>$status]);
+		$result			= $Model->edit($id,['status'=>$status,'lottery_id'=>$oldData['lottery_id']]);
 		// 提示新增失败
 		if( !$result )	return json_send(['code'=>'error','msg'=>'设置失败']);
 		// 记录行为

app/Http/Controllers/Api/Lottery/Order.php

@@ -176,90 +176,119 @@ class Order extends Api{
 		$data['join_num']				= $data['join_num'] = ($orderTotal > 0 ? 1 - $lotterUsed : 0);
 		// 如果次数不够
 		if( $data['join_num'] <= 0 )	return json_send(['code'=>'error','msg'=>'抽奖次数已用完','data'=>['error'=>'抽奖次数已用完']]);
+		// 获取奖励结果
+		$rewardResult 					= $OrderReward->getRewardResult($lotteryId);
+		// 未抽中
+		if( !$rewardResult )			return json_send(['code'=>'error','msg'=>'谢谢参与','data'=>['error'=>'谢谢参与']]);
+		// 奖品索引
+		$rewardIndex					= $rewardResult['index'];
+		// 奖品列表
+		$reward							= $rewardResult['reward_list'];
+		// 获取奖品信息
+		$rewardResult 					= $reward[$rewardIndex];
 		// 组合数据，写入订单表，子表
 		DB::beginTransaction();
 		try{
+			// 奖品数量减少
+			$result 					= $OrderReward->edit($rewardResult['id'],['reward_total'=>DB::raw('reward_total+-1'),'lottery_id'=>$rewardResult['lottery_id']]);
+			// 如果奖品数量减少失败
+			if( !$result )				{
+				// 回退数据
+				DB::rollBack();
+				// 提醒重试
+				return 					json_send(['code'=>'error','msg'=>'抽奖失败，请重试','data'=>['error'=>'奖品数量扣减失败']]);
+			}
 			// 扣减积分
-			$result 						= $OrderUsed->add(['lottery_id'=>$data['id'],'custom_uid'=>$uid]);
+			$result 					= $OrderUsed->add(['lottery_id'=>$data['id'],'custom_uid'=>$uid]);
 			// 如果积分扣减失败
-			if( !$result )					{
+			if( !$result )				{
 				// 回退数据
 				DB::rollBack();
-				return 						json_send(['code'=>'error','msg'=>'抽奖次数扣减失败','data'=>['error'=>'抽奖次数扣减失败']]);
+				// 通知重试
+				return 					json_send(['code'=>'error','msg'=>'抽奖扣减失败，请重试','data'=>['error'=>'抽奖次数扣减失败']]);
 			}
-			// 获取奖励结果
-			$rewardIndex 					= $OrderReward->getRewardResult($reward);
-			// 如果中奖，下标不是0
-			if( $rewardIndex )				{
-				// 获取奖品
-				$rewardResult				= $reward[$rewardIndex];
-				// 奖品记录ID
-				if( !empty($rewardResult['id']) ){
-					// 记录，默认状态为1，进行中
-					$record					= ['custom_uid'=>$uid,'lottery_id'=>$lotteryId,'reward_id'=>$rewardResult['id'],'reward_name'=>$rewardResult['reward_name'],'status'=>1];
-					// 如果是积分
-					if( $rewardResult['reward_type'] == 1 ){
-						// 积分大于0
-						if( $rewardResult['reward_info'] > 0 ){
-							// 积分发放
-							$result 		= $CustomScore->trade($uid,$lotteryId,$rewardResult['reward_info'],7,3);
-							// 发放失败，改为未中奖
-							if( isset($result['error']) ) $rewardIndex = 0;
-							// 发放成功，状态为已完成
-							$record['status']= 8;
-						}
+			// 记录，默认状态为1，进行中
+			$record						= ['custom_uid'=>$uid,'lottery_id'=>$lotteryId,'reward_id'=>$rewardResult['id'],'reward_name'=>$rewardResult['reward_name'],'status'=>1];
+			// 如果是积分
+			if( $rewardResult['reward_type'] == 1 ){
+				// 积分大于0
+				if( $rewardResult['reward_info'] > 0 ){
+					// 积分发放
+					$result 			= $CustomScore->trade($uid,$lotteryId,$rewardResult['reward_info'],7,3);
+					// 发放失败，改为未中奖
+					if( isset($result['error']) ) {
+						// 回退数据
+						DB::rollBack();
+						// 通知重试
+						return 			json_send(['code'=>'error','msg'=>'出了点小差，请重新抽奖','data'=>$result]);
 					}
-					// 优惠券，先进行发放
-					if( $rewardResult['reward_type'] == 2 ){
-						// 优惠券存在ID
-						if( $rewardResult['reward_info'] > 0 ){
-							// 积分给与
-							$result 		= $CustomCoupon->giveCoupon($rewardResult['reward_info'],$uid);
-							// 发放失败，改为未中奖
-							if( !$result ) 	$rewardIndex = 0;
-							// 发放成功，状态为已完成
-							$record['status']= 8;
-						}
+					// 发放成功，状态为已完成
+					$record['status']	= 8;
+				}
+			}
+			// 优惠券，先进行发放
+			if( $rewardResult['reward_type'] == 2 ){
+				// 优惠券存在ID
+				if( $rewardResult['reward_info'] > 0 ){
+					// 积分给与
+					$result 			= $CustomCoupon->giveCoupon($rewardResult['reward_info'],$uid);
+					// 发放失败，改为未中奖
+					if( isset($result['error']) ) {
+						// 回退数据
+						DB::rollBack();
+						// 通知重试
+						return 			json_send(['code'=>'error','msg'=>'出了点小差，请重新抽奖','data'=>$result]);
 					}
-					// 红包
-                    if( $rewardResult['reward_type'] == 3 ){
-                        // 积分大于0
-                        if( $rewardResult['reward_info'] > 0 ){
-                            // 积分发放
-                            $result 		= $CustomAmount->trade($uid,$lotteryId,$rewardResult['reward_info'],6,1,'下单抽奖');
-                            // 发放失败，改为未中奖
-                            if( isset($result['error']) ) $rewardIndex = 0;
-                            // 发放成功，状态为已完成
-                            $record['status']= 8;
-                        }
-                    }
-					// 如果是实物，要求填写地址，状态设置为0
-					if( $rewardResult['reward_type'] == 5 ) $record['status'] = 0;
-					// 中奖才进行记录
-					if( $rewardIndex ) 		{
-						// 奖品数量减少
-						$OrderReward->edit($rewardResult['id'],['reward_total'=>DB::raw('reward_total+-1')]);
-						// 扣减数量
-						$OrderRecord->add($record);
+					// 发放成功，状态为已完成
+					$record['status']	= 8;
+				}
+			}
+			// 红包
+			if( $rewardResult['reward_type'] == 3 ){
+				// 积分大于0
+				if( $rewardResult['reward_info'] > 0 ){
+					// 积分发放
+					$result 			= $CustomAmount->trade($uid,$lotteryId,$rewardResult['reward_info'],6,1,'下单抽奖');
+					// 发放失败，改为未中奖
+					if( isset($result['error']) ) {
+						// 回退数据
+						DB::rollBack();
+						// 通知重试
+						return 			json_send(['code'=>'error','msg'=>'出了点小差，请重新抽奖','data'=>$result]);
 					}
+					// 发放成功，状态为已完成
+					$record['status']	= 8;
 				}
 			}
+			// 如果是实物，要求填写地址，状态设置为0
+			if( $rewardResult['reward_type'] == 5 ) $record['status'] = 0;
+			// 如果是实物，要求填写地址，状态设置为0
+			if( $rewardResult['reward_type'] == 7 ) $record['status'] = 8;
+			// 扣减数量
+			$result 					= $OrderRecord->add($record);
+			// 记录失败
+			if( !$result )				{
+				// 回退数据
+				DB::rollBack();
+				// 下单失败提示
+				return					json_send(['code'=>'error','msg'=>'抽奖失败，请重试','data'=>['error'=>'奖品记录失败']]);
+			}
 			// 提交事务
 			DB::commit();
 			// 通过活动ID，查询奖品
-			$rewardList						= [];
+			$rewardList					= [];
 			// 奖品数据
-			foreach ($reward as $value) 	{
-				$rewardList[]				= ['id'=>$value['id'],'name'=>$value['reward_name'],'img'=>$value['reward_thumb'],'reward_type'=>$value['reward_type']];
+			foreach ($reward as $value) {
+				$rewardList[]			= ['id'=>$value['id'],'name'=>$value['reward_name'],'img'=>$value['reward_thumb'],'reward_type'=>$value['reward_type']];
 			}
 			// 返回结果
-			return							json_send(['code'=>'success','msg'=>'抽奖成功','data'=>['reward_list'=>$rewardList,'reward_index'=>$rewardIndex,'join_num'=>$data['join_num']-1]]);
+			return						json_send(['code'=>'success','msg'=>'抽奖成功','data'=>['reward_list'=>$rewardList,'reward_index'=>$rewardIndex,'join_num'=>$data['join_num']-1]]);
 			// 异常处理
-		} catch (\Throwable $th) {
+		} catch (\Throwable $th) 		{
 			// 回退数据
 			DB::rollBack();
 			// 下单失败提示
-			return							json_send(['code'=>'error','msg'=>'抽奖失败，请重试','data'=>['error'=>$th->getMessage().$th->getLine()]]);
+			return						json_send(['code'=>'error','msg'=>'抽奖失败，请重试','data'=>['error'=>$th->getMessage().$th->getLine()]]);
 		}	
 
 	}

app/Models/Lottery/OrderReward.php

@@ -34,7 +34,7 @@ class OrderReward extends Model
         // 如果操作失败
         if( !$id )                          return $id;
         // 更新缓存
-        $this->getList(true);
+        if( isset($data['lottery_id']))     $this->getList($data['lottery_id'],true);
         // 返回结果
         return                              $id;
     }
@@ -52,7 +52,7 @@ class OrderReward extends Model
         // 如果操作失败
         if( !$result )                      return $result;
         // 更新缓存
-        $this->getList(true);
+        if( isset($data['lottery_id']))     $this->getList($data['lottery_id'],true);
         // 返回结果
         return                              $result;
     }
@@ -62,16 +62,14 @@ class OrderReward extends Model
      * @param   bool    $force  是否强制更新
      * 
      */
-    public function getList($force = false)
+    public function getList($lotteryId, $force = false)
     {
         // 结果数据
-        $list                  = $force ? [] : cache('admin:lottery:order:reward:list');
+        $list                  = $force ? [] : cache('admin:lottery:order:reward:list:'.$lotteryId);
         // 不存在数据
         if ( !$list ) {
             // 从数据库获取数据
-            $data              = $this->query()->where([['status','=',0]])->get(['id','reward_name','reward_thumb','reward_type','reward_total','reward_info','probability','lottery_id']);
-            // 是否有数据
-            $data              = $data ? $data->toArray() : [];
+            $data              = $this->query()->where([['lottery_id','=',$lotteryId],['status','=',0]])->get(['id','reward_name','reward_thumb','reward_type','reward_all','reward_total','reward_info','probability','lottery_id'])->toArray();
             // 循环处理数据
             $list              = [];
             // 进行更新
@@ -82,7 +80,7 @@ class OrderReward extends Model
                 $list[$value['id']] = $value;
             }
             // 存起来
-            cache(['admin:lottery:order:reward:list'=>$list]);
+            cache(['admin:lottery:order:reward:list:'.$lotteryId=>$list]);
         }
         // 返回结果
         return                  $list;
@@ -95,10 +93,10 @@ class OrderReward extends Model
      * @param   string     指定字段
      * 
      */
-    public function getOne($id,$field='')
+    public function getOne($lotteryId,$id,$field='')
     {
         // 获取列表数据
-        $list                   = $this->getList();
+        $list                   = $this->getList($lotteryId);
         // 获取数据
         $one                    = isset($list[$id]) ? $list[$id] : [];
         // 返回值
@@ -113,32 +111,48 @@ class OrderReward extends Model
     public function getListByLottery($lotteryId)
     {
         // 结果数据
-        $data                  = $this->getList();
-        //  返回结果
-        $list                  = [];
+        $list                               = $this->getList($lotteryId);
+        // 查询奖品总份数
+		$total				                = $list ? array_sum(array_column($list,'reward_all')) : 0;
         // 循环处理
-        foreach ($data as $value) {
-            // 获取数据
-            if( $lotteryId == $value['lottery_id'] )  $list[] = $value;
+        foreach ($list as $key=>$value)     {
+            // 中奖概率，如果不存在的话
+			$value['probability']           = $total ? round($value['reward_all'] / $total * 100,2) : 0;
+			// 重组
+			$list[$key]			            = $value;
         }
-        // 追加一个谢谢参与
-        if( $list )            array_unshift($list,['id'=>0,'reward_name'=>'谢谢参与','reward_thumb'=>'','reward_type'=>0,'reward_total'=>1,'reward_info'=>'','probability'=>0,'lottery_id'=>$lotteryId]);
+        // 获取列表结构
+        $list                               = array_values($list);
+        // 增补一个谢谢参与
+        // if( $list )            array_unshift($list,['id'=>0,'reward_name'=>'谢谢参与','reward_thumb'=>'','reward_type'=>0,'reward_total'=>1,'reward_info'=>'','probability'=>0,'lottery_id'=>$lotteryId]);
         // 返回结果
-        return                 $list;
+        return                              $list;
     }
 
     /**
      * 获取抽奖结果
-     * @param   array    $reward  奖品列表
+     * @param   int    $lotteryId  活动
      * 
      */
-    public function getRewardResult($reward){
+    public function getRewardResult($lotteryId){
+        // 获取奖项
+        $reward                         = $this->getListByLottery($lotteryId);
+        // 如果已经没有奖项
+        if( !$reward )                  return [];
+        // 没有任何奖品的话，直接返回
+        $total                          = array_sum(array_column($reward,'reward_all'));
+        // 如果已经没有奖项
+        if( !$total )                   return [];
+        // 计算剩余总数
+        $total                          = array_sum(array_column($reward,'reward_total'));
+        // 如果已经没有奖项
+        if( !$total )                   return [];
         // 从0开始, 包含0
 		$offset							= 0;
 		// 随机数，包含起始值，不含结束值
 		$randInt						= random_int($offset,10000);
 		// 中奖下标
-		$index							= 0;
+		$index							= -1;
 		// 循环奖品
 		foreach ($reward as $key => $value) {
             // 概率为0 或者产品份数为0，不参与
@@ -152,8 +166,10 @@ class OrderReward extends Model
 			// 区间内即抽中
 			if( $start <= $randInt && $end >= $randInt ) $index = $key;
 		}
+        // 如果未抽中，继续抽奖
+        if( $index < 0 )                return $this->getRewardResult($lotteryId);
         // 是否中奖，以及奖项下标
-        return                          $index;
+        return                          ['reward_list'=>$reward,'index'=>$index];
     }
 
 }

app/Models/Traits/Lottery/RewardType.php

@@ -35,6 +35,10 @@ trait RewardType
                                         'id'            =>6,
                                         // 类型名称
                                         'name'          =>'其他',
+                                    ],'7'=>[
+                                        'id'            =>7,
+                                        // 类型名称
+                                        'name'          =>'谢谢参与',
                                     ]];
 
     /**

app/Models/Traits/Orders/Status.php

@@ -18,7 +18,7 @@ trait Status
                                     ],'1'=>[
                                         'id'            =>1,
                                         'name'          =>'创建订单',// 未付款，系统报单不走支付流程的状态
-                                        'state'         =>'待付款',
+                                        'state'         =>'进行中',
                                     ],'2'=>[
                                         'id'            =>2,
                                         'name'          =>'已付款未发货',// 已付款未发货

resources/views/admin/lottery_order_reward/add.blade.php

@@ -34,17 +34,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		</select>
 	</div>
 	<div class="form-group col-sm-3">
-		<label class="control-label">奖品份数</label>
-		<input class="form-control" required="required" type="number" placeholder="奖品份数" name="reward_total" value="" />
+		<label class="control-label">奖品数量</label>
+		<input class="form-control" required="required" type="number" placeholder="奖品数量" name="reward_all" value="0" />
+	</div>
+	<div class="form-group col-sm-3">
+		<label class="control-label">剩余数量</label>
+		<input class="form-control" required="required" type="number" placeholder="剩余数量" name="reward_total" value="0" />
 	</div>
 	<div class="form-group col-sm-3">
 		<label class="control-label">奖品信息</label>
 		<input class="form-control" type="text" placeholder="积分数量，红包金额，优惠券编码" name="reward_info" value="" />
 	</div>
-	<div class="form-group col-sm-3">
+	<!-- <div class="form-group col-sm-3">
 		<label class="control-label">中奖概率</label>
 		<input class="form-control" required="required" type="number" step="0.01" min="0" placeholder="中奖概率" name="probability" max="{{$maxProbability}}" value="" />
-	</div>
+	</div> -->
 	<div class="form-group col-sm-12">
 		@csrf
 		<input id="send" type="submit" value="提交" class="btn btn-primary btn-block" />

resources/views/admin/lottery_order_reward/edit.blade.php

@@ -34,17 +34,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		</select>
 	</div>
 	<div class="form-group col-sm-3">
-		<label class="control-label">奖品份数</label>
-		<input class="form-control" required="required" type="number" placeholder="奖品份数" name="reward_total" value="{{$oldData['reward_total']}}" />
+		<label class="control-label">奖品数量</label>
+		<input class="form-control" required="required" type="number" placeholder="奖品数量" name="reward_all" value="{{$oldData['reward_all']}}" />
+	</div>
+	<div class="form-group col-sm-3">
+		<label class="control-label">剩余数量</label>
+		<input class="form-control" required="required" type="number" placeholder="剩余数量" name="reward_total" value="{{$oldData['reward_total']}}" />
 	</div>
 	<div class="form-group col-sm-3">
 		<label class="control-label">奖品信息</label>
 		<input class="form-control" type="text" placeholder="积分数量，红包金额，优惠券编码" name="reward_info" value="{{$oldData['reward_info']}}" />
 	</div>
-	<div class="form-group col-sm-3">
+	<!-- <div class="form-group col-sm-3">
 		<label class="control-label">中奖概率</label>
 		<input class="form-control" required="required" type="number" step="0.01" min="0" placeholder="中奖概率" name="probability" max="{{$maxProbability}}" value="{{$oldData['probability']}}" />
-	</div>
+	</div> -->
 	<div class="form-group col-sm-12">
 		@csrf
 		<input type="hidden" name="id" id="id" value="{{$oldData['id']}}" />

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

@@ -24,11 +24,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<input type="submit" class="btn btn-sm btn-primary" value="查询"/>
 	<a href="{{url('admin/lottery_order_reward/index')}}" class="btn btn-sm btn-default" >重置</a>
 </form>
-<div class="row">
-	<div class="col-xs-12">	
-		<p class="text-center text-red">奖项请设置3-7个，默认自带一个谢谢参与奖项</p>
-	</div>
-</div>
 <div class="row">
 	<div class="col-xs-12">	
 		<div class="table-responsive">
@@ -39,7 +34,8 @@ 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,8 +51,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							<td>{{$a['reward_name']}}</td>
 							<td>{{$a['reward_type']}}</td>
 							<td>{{$a['reward_info']}}</td>
+							<td>{{$a['reward_all']}}</td>
 							<td>{{$a['reward_total']}}</td>
-							<td>{{$a['probability']}}</td>
+							<td>{{$a['probability']}}%</td>
 							<td>
 								@foreach ($lotteryList as $value)
 									@if( $a['lottery_id'] == $value['id'] ) {{$value['name']}} @endif
@@ -79,10 +76,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						</tr>  
 						@endforeach
 						<tr>
-							<td colspan="20" class="page">{{$list->render()}}</td>
-						</tr>
-						<tr>
-							<td colspan="20">总计 {{$list->total()}} 个商店</td>
+							<td colspan="20">总计 {{count($list)}} 个奖品</td>
 						</tr>
 				</tbody>