Merge remote-tracking branch 'origin/develop' into develop

application/adminapi/controller/User.php

@@ -696,7 +696,7 @@ class User extends adminApi
         $gift_total = 0;
         $gift_count = 0;
         foreach ($list as $key => &$value) {
-            $value['createtime'] = date('Y-m-d H:i:s',$value['createtime']);
+            $value['createtime'] = date('Y-m-d H:i:s',$value['updatetime']);
             $value['nickname'] = $value['nickname'].'-'.$value['user_code'];
             $value['gift_id_name'] = $value['gift_name'].'-'.$value['gid'];
         }
@@ -709,13 +709,25 @@ class User extends adminApi
             ->where($where)
             ->where(['a.num'=>['>',0]])
             ->sum('a.num');
-        $gift_total = db::name('vs_user_gift_pack')
+//        $gift_total = db::name('vs_user_gift_pack')
-            ->alias('a')
+//            ->alias('a')
+//            ->join('user b', 'a.user_id = b.id')
+//            ->join('vs_gift c', 'a.gid = c.gid')
+//            ->where($where)
+//            ->where(['a.num'=>['>',0]])
+//            ->sum('c.gift_price');
+        $listss = Db::name('vs_user_gift_pack')->alias('a')
             ->join('user b', 'a.user_id = b.id')
             ->join('vs_gift c', 'a.gid = c.gid')
             ->where($where)
-            ->where(['a.num'=>['>',0]])
+            ->field('a.num,c.gift_price')
-            ->sum('c.gift_price');
+            ->select();
+
+        foreach ($listss as $v) {
+            $gift_total += $v['num'] * $v['gift_price'];
+        }
+
+
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,

application/api/controller/Xxiaoshi.php

@@ -8,7 +8,7 @@ use think\Log;
 
 use app\common\controller\Push;
 
-class Xxiaoshi extends Controllers
+class Xxiaoshi extends Controller
 {
     
     public function test()
@@ -27,4 +27,27 @@ class Xxiaoshi extends Controllers
         }
     }
 
+
+    //测试数据
+    public function testData()
+    {
+        $res = db::name('vs_user_gift_pack_log')->alias('a')
+            ->join('user b','a.user_id = b.id')
+            ->field('a.gid,b.nickname,a.user_id,a.gid,a.after_num')
+            ->where(['a.updatetime'=> ['<=', 1766332800]])
+            ->group('a.gid')
+            ->select();
+        $total_price = 0;
+        if($res){
+            foreach ($res as $v){
+                $gft_price = db::name('vs_gift')->where('gid',$v['gid'])->value('gift_price');
+                $total_price += $gft_price * $v['after_num'];
+            }
+        }
+        echo $total_price;
+        echo '<br>';
+        var_dump($res);
+
+    }
+
 }

application/api/model/Room.php

@@ -2472,7 +2472,8 @@ class Room extends Model
         }
 
         //是否设置开播提醒
-        $user_info['is_open_live_remind'] = db::name('vs_user_live_remind')->where(['user_id' => $uid,'remind_user_id' => $user_id])->find() ? 1 : 0;
+//        $user_info['is_open_live_remind'] = db::name('vs_user_live_remind')->where(['user_id' => $uid,'remind_user_id' => $user_id])->find() ? 1 : 0;
+        $user_info['is_open_live_remind'] = 0;
 
         //用户所属工会
         $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0,'status' => 1])->value('guild_id');

application/api/model/UserData.php

@@ -367,6 +367,7 @@ class UserData extends Model
         //生成faceId
         $faceId = model('Tencent')->getFaceId($orderNo,$real_name,$id_card,$sign,$user_id,$config['tencent_app_id'],$nonceStr);
         if(isset($faceId['code'])){
+            Log::record("实名生成faceId结果：".json_encode($faceId),"info");
             return ['code' => 0, 'msg' => $faceId['msg'],'data' =>null];
         }