0924

application/Admin/controller/Account.php

@@ -273,6 +273,10 @@ class Account extends Base
                     }
               //$relo=["video_id"=>$video,"accountid"=>$video,"addtime"=>date("Y-m-d H:i:s")];
                 $k=[];
+                 $vb = Db::name('video')->where(['status'=>0,'id'=>$video])->select();
+                 if(empty($vb)){
+                     return error_show(1004,"存在已禁用的视频");
+                 }
                 foreach ($video as $valu){
                     $temp=["video_id"=>$valu,"accountid"=>$id,"addtime"=>date("Y-m-d H:i:s")];
                     $k[]=$temp;
@@ -284,6 +288,7 @@ class Account extends Base
                 }else{
                     write_log("视频绑定成功",$this->userinfo,"account","edit");
                 }
+
                 if($infoacc){
                         write_log("账户{$username}新建成功",$this->userinfo,"account","edit");
                         Db::commit();

application/Admin/controller/Order.php

@@ -44,11 +44,42 @@ class Order extends Base
          $order_up = date("Y-m-d H:i:s");
      }
      $where['order_time'] = ["between",[$order_low,$order_up]];
-     $count= Db::name("order_info")->where($where)->count();
+     $count= Db::name("order")->where($where)->count();
      $total = ceil($count/$size);
      $page = $page>=$total? $total:$page;
-     $list = Db::name("order_info")->where($where)->page($page,$size)->field("id,order_sn,username,nickname,order_num,
-     post_code,post_name,status,contector,contector_mobile,provice_name,city_name,area_name,addr,delivery_time,order_time")
+     $list = Db::name("order a")->where($where)->page($page,$size)->join("fc_order_post b","a.order_sn=b.order_sn","left")
+         ->join("fc_addr c","b.addrid = c.id","left")
+         ->join("fc_account e","a.accountid = e.id","left")
+         ->join("fc_rela_account f","a.accountid = f.accountid","left")
+         ->join("fc_account_info g","f.account_info =g.id","left")
+         ->field("`a`.`id` AS `id`,
+	`a`.`order_sn` AS `order_sn`,
+	`a`.`accountid` AS `accountid`,
+	`a`.`order_num` AS `order_num`,
+	`a`.`status` AS `status`,
+	`a`.`is_del` AS `is_del`,
+	`a`.`delivery_time` AS `delivery_time`,
+	`a`.`order_time` AS `order_time`,
+	`b`.`addrid` AS `addrid`,
+	`b`.`order_num` AS `border_num`,
+	`b`.`post_code` AS `post_code`,
+	`b`.`post_name` AS `post_name`,
+	`b`.`status` AS `bstatus`,
+	`c`.`addr` AS `addr`,
+	`c`.`provice` AS `provice`,
+	`c`.`city` AS `city`,
+	`c`.`provice_name` AS `provice_name`,
+	`c`.`city_name` AS `city_name`,
+	`c`.`area` AS `area`,
+	`c`.`area_name` AS `area_name`,
+	`c`.`contector` AS `contector`,
+	`c`.`mobile` AS `contector_mobile`,
+	`e`.`username` AS `username`,
+	`g`.`nickname` AS `nickname`,
+	`g`.`mobile` AS `mobile`,
+	`a`.`unit_weight` AS `unit_weight`,
+	`a`.`unit` AS `unit`
+	")
          ->order("order_time desc")
          ->select();
      return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);

application/Home/controller/Order.php

@@ -98,7 +98,7 @@ class Order extends Base
             return error_show(1004,"unit_id不能为空");
         }
 
-        $kg= Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->field("id,name,weight")->find();
+        $kg= Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->field("id,name,weight,limit_num")->find();
        // var_dump(Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->getLastSql());
         if(empty($kg)){
             return error_show(1004,"单位不能为空");
@@ -107,6 +107,16 @@ class Order extends Base
         if($count==""){
             return error_show(1004,"购买数量不能为空");
         }
+        if($kg['limit_num']>0){
+            $zl = Db::name('order_log')->where(["unit_id"=>$id,"accountid"=>$this->userinfo['id']])->sum('num');
+            if(empty($zl)){
+                return error_show(1004,"重量不能为空");
+            }
+            if($zl['num']+$num>$kg['limit_num']){
+                return error_show(1004,"购买数量超过限额");
+            }
+        }
+
         $addrid = isset($this->post['addrid'])&&$this->post['addrid']!="" ? intval($this->post['addrid']):"";
         if($addrid==""){
             return error_show(1004,"参数addrid 不能为空");