Przeglądaj źródła

几个微调整

lizhen_gitee 1 rok temu
rodzic
commit
2ce66acda1

+ 1 - 1
application/admin/model/Topicdongtai.php

@@ -51,7 +51,7 @@ class Topicdongtai extends Model
 
                 } elseif($changed['auditstatus'] == 1) {
                     //通过
-                    $msg_id = \app\common\model\Message::addMessage($row['user_id'],'动态审核','动态审核通过');
+                    //$msg_id = \app\common\model\Message::addMessage($row['user_id'],'动态审核','动态审核通过');
                 }
             }
         });

+ 2 - 2
application/api/controller/Gift.php

@@ -121,7 +121,7 @@ class Gift extends Api
         if($giftvalue > 0){
 
             // 扣除当前用户余额
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,'gold',-$giftvalue,53,'赠送礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,'gold',-$giftvalue,53,'赠送给'.$touserinfo['nickname'].'礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);
@@ -134,7 +134,7 @@ class Gift extends Api
             $giftmoney = bcdiv($giftvalue,$money_to_gold,2);
 
             $money = bcdiv(bcmul($giftmoney,100 - $gift_plat_scale,2),100,2);
-            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,'money',$money,54,'获得礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
+            $wallet_rs = model('wallet')->lockChangeAccountRemain($user_id,'money',$money,54,$this->auth->nickname.'赠送礼物:'.$giftinfo["name"],'gift_user_typing',$log_id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);

+ 1 - 1
application/api/controller/Index.php

@@ -69,7 +69,7 @@ class Index extends Api
         if($distancemin > 0){
             $having_dis = 'distance > '.$distancemin*1000;
         }
-        $distancemax = input('distancemax',0);
+        $distancemax = input('distancemax',100);
         if($distancemax > 0){
             $having_dis = 'distance < '.$distancemax*1000;
         }

+ 1 - 1
application/api/controller/Relation.php

@@ -190,7 +190,7 @@ class Relation extends Api
         //发起人也要发消息
         //系统消息
         $to_nickname = Db::name('user')->where('id',$to_uid)->value('nickname');
-        $msg_id = \app\common\model\Message::addMessage($this->auth->id,'申请关系','您正在申请与'.$to_nickname.'成为'.$relation_name.'关系,请等待对方同意');
+        $msg_id = \app\common\model\Message::addMessage($this->auth->id,'申请关系','您正在申请与'.$to_nickname.'成为'.$relation_name.'关系,请等待对方同意','applyrelation');
 
         Db::commit();