Merge branch 'master' of http://git.dongerkj.com:9095/waibao/NN2021012701

app/weixin/service/Member.php

@@ -198,7 +198,7 @@ class Member
      * @throws \think\exception\PDOException
      */
     public static function checkComplain($userId, $info = [])
-    {
+    {   
         $cid = isset($info['id'])? $info['id'] : 0;
         if(empty($cid) || Complain::where(['id'=> $cid])->value('status') != 1){
             return false;
@@ -216,7 +216,7 @@ class Member
 
         $siteInfo = cmf_get_site_info();
         $awardNum = isset($siteInfo['complain_award_redheart']) ? intval($siteInfo['complain_award_redheart']) : 0;
-        if ($awardNum > 0) {
+        if ($awardNum > 0) { 
             $cuid = isset($info['c_uid'])? $info['c_uid'] : 0;
             $cUserInfo = MemberModel::alias('u')
                 ->leftJoin('sg_user_profile sp','sp.userid=u.id')
@@ -228,15 +228,15 @@ class Member
             }
 
             // 更新状态
-            Complain::where(['id'=> $cid])->update(['status'=> 2]);
-
+            //Complain::where(['id'=> $cid])->update(['status'=> 2]);
+            //Db::startTrans();
             // 冻结被举报用户
             $freezing = isset($info['remark'])? $info['remark'] : '被人举报';
-            MemberModel::where(['id'=> $cuid,'user_type'=> 2])->update(['user_status'=> 0,'freezing'=> $freezing]);
+            $result1=MemberModel::where(['id'=> $cuid,'user_type'=> 2])->update(['user_status'=> 0,'freezing'=> $freezing]);
 
             // 奖励入账
-            MemberModel::where(['id' => $userId])->update(['redheart' => moneyFormat($redheart + $awardNum), 'updated_at' => date('Y-m-d H:i:s')]);
-
+           $result2= MemberModel::where(['id' => $userId])->update(['redheart' => moneyFormat($redheart + $awardNum), 'updated_at' => date('Y-m-d H:i:s')]);
+           // echo $cuid.'::'.$userId;die();
             // 账户明细
             $dateTime = date('Y-m-d H:i:s');
             $cNickname = isset($cUserInfo['user_nickname']) ? $cUserInfo['user_nickname'] : '';
@@ -251,8 +251,8 @@ class Member
                 'created_at' => $dateTime,
             ];
 
-            db('account_log')->insertGetId($logData);
-
+            $result3=db('account_log')->insertGetId($logData);
+            //if($result1 && $result2 && $result3){Db::commit();}else{Db::rollback();}
             // 发送模板消息给举报用户
             $openid = isset($userInfo['openid'])? $userInfo['openid'] : '';
             if($openid){
@@ -278,7 +278,7 @@ class Member
 
             // 被举报用户通知
             $cOpenid = isset($cUserInfo['openid'])? $cUserInfo['openid'] : '';
-            $cnickname = isset($cUserInfo['nickname'])? $cUserInfo['nickname'] : '';
+           $cnickname = isset($cUserInfo['user_nickname'])? $cUserInfo['user_nickname'] : '';
             if($cOpenid){
                 $params = [
                     'title' => "尊敬的{$cnickname}用户，由于您的账号被多人举报经平台已经将您的账号冻结，若有疑问请联系平台客服\n\n举报原因：\t{$freezing}",

vendor/thinkcmf/cmf-app/src/user/controller/AdminIndexController.php

@@ -974,29 +974,29 @@ class AdminIndexController extends AdminBaseController
         if (isset($param['ids'])) {
             $ids = $this->request->param('ids');
             //通过id来获取举报页面
-            Db::startTrans();
-            $result=Db::name('complain')->where('id',$ids)->find();var_dump($result);die;
+        // Db::startTrans();
+            $result=Db::name('complain')->where('id',$ids)->find(); 
             if($result){
                 //进行奖励
                 $member=Member::checkComplain($result['uid'],$result);
                 if($member){
                     //  //变更举报状态
-                    // $complain=Db::name('complain')->where('id', 'in', $ids)->update(['status' => 2]);
-                    // if($complain){
+                    $complain=Db::name('complain')->where('id', 'in', $ids)->update(['status' => 2]);
+                    if($complain){
 
-                    // }else{
-                    //       Db::rollback();   
-                    //      $this->error("处理失败！");
-                    // }
+                    }else{
+                     //  Db::rollback();   
+                         $this->error("处理失败！");
+                    }
 
                 }else{
-                    Db::rollback();   
+                    //Db::rollback();   
                     $this->error("处理失败！");
                 }
               
-                Db::commit();   
+              //Db::commit();   
             }else{
-                Db::rollback();   
+               Db::rollback();   
                 $this->error("处理失败！");
             }