diff --git a/application/adminapi/controller/Statistical.php b/application/adminapi/controller/Statistical.php index 9a4ce692..c3d8eaab 100644 --- a/application/adminapi/controller/Statistical.php +++ b/application/adminapi/controller/Statistical.php @@ -645,26 +645,37 @@ class Statistical extends adminApi // 计算奖励信息 if (isset($bag_details[$list['tasks_bag_id']])) { - $reward_info = $bag_details[$list['tasks_bag_id']]; - foreach ($reward_info as $value) { - //价格 - $reward_price = 0; - if($value['type'] == 1){ - $reward_name = $value['quantity'].$value['name']; - $reward_price = $value['gold'] * $value['quantity']; - }elseif($value['type'] == 2){ - $reward_name = $value['name'].'x'.$value['quantity']; - $gift_price = isset($gift_prices[$value['foreign_id']]) ? $gift_prices[$value['foreign_id']] : 0; - $reward_price = $gift_price * $value['quantity']; - }elseif($value['type'] == 3){ - $reward_name = $value['name'].'x'.$value['days'].'天'; - //$reward_price = isset($decorate_prices[$value['foreign_id']]) ? $decorate_prices[$value['foreign_id']] : 0; - }else{ - $reward_name = $value['quantity'].$value['name']; - //$reward_price = $value['gold'] * $value['quantity']; + if($list['task_id']==1){ + $sign_in_info = Db::name('vs_user_tasks_sign_in')->where(['user_id'=>$list['user_id'],'sign_in_date'=>date('Y-m-d', $list['createtime'])])->order('id desc')->find(); + if($sign_in_info){ + $data_list[$listkey]['reward_str'] = ($bag_details[$list['tasks_bag_id']][$sign_in_info['continuous']-1]['gold'] + * $bag_details[$list['tasks_bag_id']][$sign_in_info['continuous']-1]['quantity']) + .$bag_details[$list['tasks_bag_id']][$sign_in_info['continuous']-1]['name']; + $data_list[$listkey]['reward_price'] = $bag_details[$list['tasks_bag_id']][$sign_in_info['continuous']-1]['gold'] + * $bag_details[$list['tasks_bag_id']][$sign_in_info['continuous']-1]['quantity']; + } + }else{ + $reward_info = $bag_details[$list['tasks_bag_id']]; + foreach ($reward_info as $value) { + //价格 + $reward_price = 0; + if($value['type'] == 1){ + $reward_name = $value['quantity'].$value['name']; + $reward_price = $value['gold'] * $value['quantity']; + }elseif($value['type'] == 2){ + $reward_name = $value['name'].'x'.$value['quantity']; + $gift_price = isset($gift_prices[$value['foreign_id']]) ? $gift_prices[$value['foreign_id']] : 0; + $reward_price = $gift_price * $value['quantity']; + }elseif($value['type'] == 3){ + $reward_name = $value['name'].'x'.$value['days'].'天'; + //$reward_price = isset($decorate_prices[$value['foreign_id']]) ? $decorate_prices[$value['foreign_id']] : 0; + }else{ + $reward_name = $value['quantity'].$value['name']; + //$reward_price = $value['gold'] * $value['quantity']; + } + $data_list[$listkey]['reward_str'] .= $reward_name." "; + $data_list[$listkey]['reward_price'] += $reward_price; } - $data_list[$listkey]['reward_str'] .= $reward_name." "; - $data_list[$listkey]['reward_price'] += $reward_price; } } }