Browse Source

后台-推荐人/节点人/pv统计-增加错误提示,修改订单显示逻辑

xupuyuan 10 months ago
parent
commit
9ae7719866
2 changed files with 12 additions and 13 deletions
  1. 2 11
      app/common/repositories/user/UserRepository.php
  2. 10 2
      app/controller/admin/user/User.php

+ 2 - 11
app/common/repositories/user/UserRepository.php

@@ -3126,14 +3126,9 @@ class UserRepository extends BaseRepository
3126 3126
    *@author cabbage
3127 3127
    *@date 2020-10-31
3128 3128
    * */
3129
-    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId){
3130
-        //推荐人信息
3131
-        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
3129
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId,$spread){
3132 3130
         //被推荐人信息
3133 3131
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
3134
-        if (!$spread) {
3135
-            return app('json')->fail("推荐人账号不存在");
3136
-        }
3137 3132
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
3138 3133
         if($spread){
3139 3134
             try{
@@ -3165,11 +3160,7 @@ class UserRepository extends BaseRepository
3165 3160
 
3166 3161
     }
3167 3162
 
3168
-    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId){
3169
-        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
3170
-        if (!$level) {
3171
-            return false;
3172
-        }
3163
+    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId,$level){
3173 3164
         if($level){
3174 3165
             try{
3175 3166
                 Db::name("user_level_change_records")->insert([

+ 10 - 2
app/controller/admin/user/User.php

@@ -823,7 +823,11 @@ class User extends BaseController
823 823
         }
824 824
         $mark = $operation.$mark;
825 825
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
826
-        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
826
+        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
827
+        if(!$spread){
828
+            return app('json')->fail("推荐人信息不存在");
829
+        }
830
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId,$spread)){
827 831
             return app('json')->success("修改成功");
828 832
         }else{
829 833
             return app('json')->fail("失败");
@@ -864,10 +868,14 @@ class User extends BaseController
864 868
             $mark = "($mark)";
865 869
         }
866 870
         $mark = $operation.$mark;
871
+        $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
872
+        if(!$level){
873
+            return app('json')->fail("节点人信息不存在");
874
+        }
867 875
         if (!$id) {
868 876
             return app('json')->fail("参数丢失");
869 877
         }
870
-        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId)){
878
+        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId,$level)){
871 879
             return app('json')->success("修改成功");
872 880
         }else{
873 881
             return app('json')->fail("失败"); }