|
@@ -507,7 +507,7 @@ class Usercenter extends Api
|
|
|
|
|
|
$vip_chat_discount = config('site.vip_chat_discount');
|
|
|
if ($vip_chat_discount >= 0 && $vip_chat_discount <= 10) {
|
|
|
- $price = ceil($price * $vip_chat_discount / 10);
|
|
|
+ $price = bcdiv(bcmul($price,$vip_chat_discount,2),10,0);
|
|
|
}
|
|
|
} else {
|
|
|
$price = $to_user_info['chat_price'];
|
|
@@ -585,11 +585,11 @@ $resArray['money'] = $money;
|
|
|
Db::rollback();
|
|
|
$this->error('完成任务赠送奖励失败');
|
|
|
}
|
|
|
-
|
|
|
+ $task_rs = \app\common\model\TaskLog::tofinish($to_user_id,23);
|
|
|
if($task_rs === false){
|
|
|
Db::rollback();
|
|
|
$this->error('完成任务赠送奖励失败');
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
Db::commit();
|
|
|
|
|
@@ -631,7 +631,7 @@ $resArray['money'] = $money;
|
|
|
|
|
|
$vip_video_discount = config('site.vip_video_discount');
|
|
|
if ($vip_video_discount >= 0 && $vip_video_discount <= 10) {
|
|
|
- $price = ceil($price * $vip_video_discount / 10);
|
|
|
+ $price = bcdiv(bcmul($price,$vip_video_discount,2),10,0);
|
|
|
}
|
|
|
} else {
|
|
|
$price = $to_user_info['voice_price'];
|
|
@@ -652,9 +652,9 @@ $resArray['money'] = $money;
|
|
|
if ($user_match_audio_log_info) {
|
|
|
|
|
|
$data = [
|
|
|
- 'price' => $user_match_audio_log_info['price'] + $price,
|
|
|
+ 'price' => bcadd($user_match_audio_log_info['price'],$price,0),
|
|
|
'createtime' => time(),
|
|
|
- 'money' => $user_match_audio_log_info['money'] + $money,
|
|
|
+ 'money' => bcadd($user_match_audio_log_info['money'],$money,2),
|
|
|
'call_minutes' => $user_match_audio_log_info['call_minutes'] + 1
|
|
|
];
|
|
|
|
|
@@ -721,11 +721,11 @@ $resArray['money'] = $money;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+ $user_intimacy_rs = addintimacy($this->auth->id, $to_user_id, $price);
|
|
|
if (!$user_intimacy_rs['status']) {
|
|
|
Db::rollback();
|
|
|
$this->error('您的网络开小差啦~');
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
@@ -804,7 +804,7 @@ $resArray['money'] = $money;
|
|
|
|
|
|
$vip_video_discount = config('site.vip_video_discount');
|
|
|
if ($vip_video_discount >= 0 && $vip_video_discount <= 10) {
|
|
|
- $price = ceil($price * $vip_video_discount / 10);
|
|
|
+ $price = bcdiv(bcmul($price,$vip_video_discount,2),10,0);
|
|
|
}
|
|
|
} else {
|
|
|
$price = $to_user_info['video_price'];
|
|
@@ -824,9 +824,9 @@ $resArray['money'] = $money;
|
|
|
if ($user_match_video_log_info) {
|
|
|
|
|
|
$data = [
|
|
|
- 'price' => $user_match_video_log_info['price'] + $price,
|
|
|
+ 'price' => bcadd($user_match_video_log_info['price'],$price,0),
|
|
|
'createtime' => time(),
|
|
|
- 'money' => $user_match_video_log_info['money'] + $money,
|
|
|
+ 'money' => bcadd($user_match_video_log_info['money'],$money,2),
|
|
|
'call_minutes' => $user_match_video_log_info['call_minutes'] + 1
|
|
|
];
|
|
|
|
|
@@ -893,11 +893,11 @@ $resArray['money'] = $money;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+ $user_intimacy_rs = addintimacy($this->auth->id, $to_user_id, $price);
|
|
|
if (!$user_intimacy_rs['status']) {
|
|
|
Db::rollback();
|
|
|
$this->error('您的网络开小差啦~');
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|