wugg 2 年 前
コミット
30af24b00c
2 ファイル変更32 行追加2 行削除
  1. 5 0
      app/admin/controller/Goodup.php
  2. 27 2
      app/admin/controller/User.php

+ 5 - 0
app/admin/controller/Goodup.php

@@ -1390,10 +1390,15 @@ class Goodup extends Base
             $platform['online_time']=$online_time;
         }
         if($exam_status==6){
+
             $good_code= isset($this->post['plat_code'])&&$this->post['plat_code']!==""?trim($this->post['plat_code']):"";
             if($good_code===""){
                 return error_show(1004,"参数plat_code不能为空");
             }
+            $issale=Db::name("sale")->where(["skuCode"=>$platform['skuCode'],"status"=>[0,1,2]])->find();
+            if($issale!=false &&$platform['plat_code']!=$good_code){
+                return error_show(1004,"商品已下单,平台订单号不允许修改");
+            }
             $is_exit = Db::name("good_platform")->where(["plat_code"=>$good_code,"platform_code"=>$platform['platform_code'],
                 "is_del"=>0])->where("id","<>", $platform['id'])->find();
             if($is_exit==false){

+ 27 - 2
app/admin/controller/User.php

@@ -520,12 +520,37 @@ class User extends BaseController
             return error_show(1004,"参数status无效");
         }
         $message = $status==1?"启用":"禁用";
-        $set = resetstatus($toke,["id"=>$userid,"status"=>$status]);
-        if(empty($set)||$set['code']!=0){
+        $userinfo =Db::name("user_role")->where(["uid"=>$userid,"is_del"=>0])->find();
+        if($userinfo==false){
+            $data=[
+                "uid"=>$userid,
+                "roleid"=>0,
+                "status"=>$status,
+                "is_del"=>0,
+                "addtime"=>date("Y-m-d H:i:s"),
+                "updatetime"=>date("Y-m-d H:i:s"),
+            ];
+            $sa=Db::name("user_role")->save($data);
+        }else{
+            $userinfo['status']=$status;
+            $userinfo['updatetime']=$status;
+            $sa=Db::name("user_role")->save($userinfo);
+        }
+       if($sa==false){
             return error_show(1005,"{$message}失败");
         }else{
+
             return app_show(0,"{$message}成功");
         }
+
+//        $set = resetstatus($toke,["id"=>$userid,"status"=>$status]);
+//
+//        if(empty($set)||$set['code']!=0){
+//            return error_show(1005,"{$message}失败");
+//        }else{
+//            D
+//            return app_show(0,"{$message}成功");
+//        }
     }
 
     public function getinfo(){