上线 零散 bug修改

application/adminapi/controller/BlindBox.php

@@ -779,14 +779,12 @@ class BlindBox extends adminApi
         $all_lists_data = db::name('vs_gift_bag_receive_log')->where($where)->order("id desc")->select();
         $total =0;
         $total_gift_money = 0;
+        $total_money = 0;
         foreach ($all_lists_data as $key => $value) {
-            $total += $value['num'];
+            $total += $value['num'];//总抽奖次数
-            $total_gift_money += $value['gift_price'] * $value['num'];
+            $total_gift_money += $value['gift_price'] * $value['num'];  //总礼物价值（收入）
+            $total_money += $value['bag_price'] * $value['num']; //总抽奖金额（支出）
         }
-        //总抽奖次数 $total
-        //总抽奖金额（支出）
-        $total_money = db::name('vs_gift_bag_receive_log')->where($where)->sum('bag_price');
-        //总礼物价值（收入） $total_gift_money
         //统计
         if($total_gift_money==0 || $total_money==0){
             $ratio = 0;

application/api/controller/Invited.php

@@ -49,6 +49,7 @@ class Invited extends BaseCom
         }
         $reslut['init_code'] = $init_code ? $init_code:'';
         $invited_draw = get_system_config_value('invited_draw');
+        $reslut['invited_draw'] = $invited_draw;
         //说明
         $reslut['explain'] = '绑定成功后，您每次充值金额的'.$invited_draw.'%'.'将以钻石形式赠送给邀请人，满足提现金额邀请人可以直接提现';
         return V(1,'操作成功',$reslut);

application/api/model/DailyTasks.php

@@ -342,10 +342,10 @@ class DailyTasks extends Model
     public function gift_bag_receive_list($user_id){
         //查询每日任务礼盒记录
         $gift_bag_receive_list = Db::name('vs_gift_bag_receive_log')
-            ->field('bag.name as gift_bag_name,de.name as gift_name,re.createtime as createtime,de.quantity,de.type,de.foreign_id,de.days,de.gold')
+            ->field('bag.name as gift_bag_name,re.createtime as createtime,de.name as gift_name,de.quantity,de.type,de.foreign_id,de.days,de.gold')
             ->alias('re')
             ->join('vs_gift_bag bag', 'bag.id = re.gift_bag_id', 'LEFT')
-            ->join('vs_gift_bag_detail de', 'de.gift_bag_id = re.gift_bag_id','LEFT')
+            ->join('vs_gift_bag_detail de', 'de.id = re.parent_id', 'LEFT')
             ->where(['re.user_id'=>$user_id,'bag.activities_id'=>2,'bag.status'=>1])
             ->order('re.createtime desc')
             ->select();

application/api/model/Decorate.php

@@ -125,7 +125,6 @@ class Decorate extends Model
         $map = [];
         $map = [
             'did' => $did,
-            'is_buy' => 1,
             'delete_time' => 0,
         ];
         $decorate_info = DB::name($this->table)->where($map)->find();

application/api/model/Invited.php

@@ -66,6 +66,7 @@ class Invited extends Model
         $invited_draw_conf = get_system_config_value('invited_draw');//分成比例
         $invited_draw = $invited_draw_conf / 100;
         $invited_draw_money = $money * $invited_draw;
+        $invited_draw_money = $invited_draw_money / intval(get_system_config_value('rmb_coin_ratio')); //金币换算成钻石
         //修改用户资金
         $reslut = model('common/UserWallet')->change_user_money($invited_user_id, $invited_draw_money, model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::OPERATION_INVITE_REBATE, '邀请用户充值返利');
         if($reslut['code'] == 1){
@@ -103,7 +104,7 @@ class Invited extends Model
             //查询用户昵称
             $v['nickname'] = model('User')->where('id', $v['sub_user_id'])->value('nickname');
             $v['coin'] = intval($v['coin']);
-            $v['earnings'] = intval($v['earnings']);
+            $v['earnings'] = number_format($v['earnings'], 2, '.', ''); // 保留两位小数
             $v['proportion'] = intval($v['proportion']);
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];