|
|
@@ -103,6 +103,8 @@ class PayRechargeController extends Controller
|
|
|
$gear = Util::filterGearByDevice(\GuzzleHttp\json_encode($names));
|
|
|
foreach ($list as &$val) {
|
|
|
$val->favorable_price = $val->favorable_price + $val->give;
|
|
|
+ $val->favorable_price = (int)$val->favorable_price;
|
|
|
+ $val->money = (int)$val->money;
|
|
|
$val->gear = $gear;
|
|
|
$val->recommend = 0;
|
|
|
if($val->money == $firstPayGift->recommend){
|
|
|
@@ -150,6 +152,8 @@ class PayRechargeController extends Controller
|
|
|
|
|
|
foreach ($list as &$val) {
|
|
|
$val->favorable_price = $val->favorable_price + $val->give;
|
|
|
+ $val->favorable_price = (int)$val->favorable_price;
|
|
|
+ $val->money = (int)$val->money;
|
|
|
$val->recommend = 0;
|
|
|
if ($val->money == $giftConfig->recommend) {
|
|
|
$val->recommend = 1;
|
|
|
@@ -729,6 +733,8 @@ class PayRechargeController extends Controller
|
|
|
if (!empty($val->gear)) {
|
|
|
$val->gear = Util::filterGearByDevice($val->gear);
|
|
|
}
|
|
|
+ $val->favorable_price = intval($val->favorable_price);
|
|
|
+ $val->money = intval($val->money);
|
|
|
}
|
|
|
|
|
|
return apiReturnSuc([
|
|
|
@@ -769,6 +775,8 @@ class PayRechargeController extends Controller
|
|
|
->where('second_give','>',0)
|
|
|
->where('first_pay','>=', 1)
|
|
|
->select('gift_id','money','give','favorable_price','second_give')->get()->each(function($item){
|
|
|
+ $item->money = (int)$item->money;
|
|
|
+ $item->favorable_price = (int)$item->favorable_price;
|
|
|
$item->id=28;
|
|
|
})->toArray();
|
|
|
$default=count($items)-1;
|
|
|
@@ -810,6 +818,8 @@ class PayRechargeController extends Controller
|
|
|
->first();
|
|
|
|
|
|
if ($gear) {
|
|
|
+ $gear->money = (int)$gear->money;
|
|
|
+ $gear->favorable_price = (int)$gear->favorable_price;
|
|
|
$gear->gift_id = $gift->gift_id;
|
|
|
$gear->total_bonus = $gift->total_bonus;
|
|
|
$gear->bonus = $gift->total_bonus - 100;
|
|
|
@@ -874,6 +884,8 @@ class PayRechargeController extends Controller
|
|
|
->first();
|
|
|
|
|
|
if ($gear) {
|
|
|
+ $gear->money = (int)$gear->money;
|
|
|
+ $gear->favorable_price = (int)$gear->favorable_price;
|
|
|
$gear->gift_id = $gift->gift_id;
|
|
|
$gear->total_bonus = $gift->total_bonus;
|
|
|
$gear->bonus = $gift->total_bonus - 100;
|
|
|
@@ -942,6 +954,8 @@ class PayRechargeController extends Controller
|
|
|
->first();
|
|
|
|
|
|
if ($gear) {
|
|
|
+ $gear->money = (int)$gear->money;
|
|
|
+ $gear->favorable_price = (int)$gear->favorable_price;
|
|
|
// 检查该档位今日是否已充值(使用浮点数比较,允许小数点精度差异)
|
|
|
$isCompleted = false;
|
|
|
foreach ($todayRecharges as $rechargeAmount) {
|
|
|
@@ -1304,6 +1318,8 @@ class PayRechargeController extends Controller
|
|
|
$give = $favorablePrice - $amount;
|
|
|
|
|
|
if ($gear) {
|
|
|
+ $gear->money = (int)$gear->money;
|
|
|
+ $gear->favorable_price = (int)$gear->favorable_price;
|
|
|
$gear->gift_id = 305;
|
|
|
$gear->favorable_price = $favorablePrice;
|
|
|
$gear->give = $give;
|