【Fix】修复抽奖奖品概率显示问题

app/Http/Controllers/Admin/LotteryOrderReward.php

@@ -34,12 +34,7 @@ class LotteryOrderReward extends Auth{
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
 		// 总奖品份数
-		$total					= 0;
-		// 处理数据
-		foreach ($list as $key => $value) {
-			// 查询奖品总份数
-			if( !$value['status'] ) $total += $value['reward_all'];
-		}
+		$total					= (int) $Model->query()->where([ ['lottery_id','=',$lotteryId]],['status','=',0])->sum('reward_all');
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 中奖概率，如果不存在的话
@@ -203,7 +198,7 @@ class LotteryOrderReward extends Auth{
 		// 启用
 		if( !$status )  {
 			// 计算统计数量
-			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']]])->count();
+			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']],['status','=',0]])->count();
 			// 获取统计数量
 			if( $count >= 7 ) return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
 		}

app/Http/Controllers/Admin/LotteryRecruitmentReward.php

@@ -34,12 +34,7 @@ class LotteryRecruitmentReward extends Auth{
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
 		// 总奖品份数
-		$total					= 0;
-		// 处理数据
-		foreach ($list as $key => $value) {
-			// 查询奖品总份数
-			if( !$value['status'] ) $total += $value['reward_all'];
-		}
+		$total					= (int) $Model->query()->where([ ['lottery_id','=',$lotteryId]],['status','=',0])->sum('reward_all');
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 中奖概率，如果不存在的话
@@ -202,7 +197,7 @@ class LotteryRecruitmentReward extends Auth{
 		// 启用
 		if( !$status )  {
 			// 计算统计数量
-			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']]])->count();
+			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']],['status','=',0]])->count();
 			// 获取统计数量
 			if( $count >= 7 ) return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
 		}

app/Http/Controllers/Admin/LotteryRiddleReward.php

@@ -32,12 +32,7 @@ class LotteryRiddleReward extends Auth{
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
 		// 总奖品份数
-		$total					= 0;
-		// 处理数据
-		foreach ($list as $key => $value) {
-			// 查询奖品总份数
-			if( !$value['status'] ) $total += $value['reward_all'];
-		}
+		$total					= (int) $Model->query()->where([ ['lottery_id','=',$lotteryId]],['status','=',0])->sum('reward_all');
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 中奖概率，如果不存在的话
@@ -204,7 +199,7 @@ class LotteryRiddleReward extends Auth{
 		// 启用
 		if( !$status )  {
 			// 计算统计数量
-			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']]])->count();
+			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']],['status','=',0]])->count();
 			// 获取统计数量
 			if( $count >= 7 ) return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
 		}

app/Http/Controllers/Admin/LotteryScoreReward.php

@@ -34,12 +34,7 @@ class LotteryScoreReward extends Auth{
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
 		// 总奖品份数
-		$total					= 0;
-		// 处理数据
-		foreach ($list as $key => $value) {
-			// 查询奖品总份数
-			if( !$value['status'] ) $total += $value['reward_all'];
-		}
+		$total					= (int) $Model->query()->where([ ['lottery_id','=',$lotteryId]],['status','=',0])->sum('reward_all');
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 中奖概率，如果不存在的话
@@ -196,7 +191,7 @@ class LotteryScoreReward extends Auth{
 		// 启用
 		if( !$status )  {
 			// 计算统计数量
-			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']]])->count();
+			$count		= $Model->query()->where([['lottery_id','=',$oldData['lottery_id']],['status','=',0]])->count();
 			// 获取统计数量
 			if( $count >= 7 ) return json_send(['code'=>'error','msg'=>'奖项不可超过7个']);
 		}

app/Http/Controllers/Admin/RedpacketActiveReward.php

@@ -28,16 +28,11 @@ class RedpacketActiveReward extends Auth{
 		// 查询条件
 		$map 					= [];
 		// 组合条件
-		if( $activeId )			$map[] = ['active_id','=',$activeId];
+		$map[]					= ['active_id','=',$activeId];
 		// 查询数据
 		$list					= $Model->query()->where($map)->orderByDesc('id')->get()->toArray();
 		// 总奖品份数
-		$total					= 0;
-		// 处理数据
-		foreach ($list as $key => $value) {
-			// 查询奖品总份数
-			if( !$value['status'] ) $total += $value['reward_all'];
-		}
+		$total					= (int) $Model->query()->where([['active_id','=',$activeId]],['status','=',0])->sum('reward_all');
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 中奖概率，如果不存在的话