瀏覽代碼

【Mod】修复缺陷

liuxiangxin 1 月之前
父節點
當前提交
7ca3680b5c
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      app/Http/Controllers/Admin/LotteryScoreReward.php
  2. 1 1
      app/Http/Controllers/Api/Redpacket/Active.php

+ 2 - 0
app/Http/Controllers/Admin/LotteryScoreReward.php

@@ -44,6 +44,8 @@ class LotteryScoreReward extends Auth{
 		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');
 			// 重组
 			$list[$key]			= $value;
 		}

+ 1 - 1
app/Http/Controllers/Api/Redpacket/Active.php

@@ -273,7 +273,7 @@ class Active extends Api{
 						$record['status']= 1;
 					}
 					// 扣减次数
-					$result 			= $ActiveReward->edit($rewardResult['id'],['reward_total'=>DB::raw('reward_total+-1')]);
+					$result 			= $ActiveReward->edit($rewardResult['id'],['reward_total'=>DB::raw('reward_total+-1'),'active_id'=>$activeId]);
 					// 发放失败,改为未中奖
 					if( !$result ) 		{
 						// 回退数据