add

application/Admin/controller/Account.php

@@ -60,6 +60,7 @@ class Account extends Base
 	                      `a`.`salt` AS `salt`,
 	                      `a`.`status` AS `status`,
                           `a`.`is_del` AS `is_del`,
+                          `a`.`type` AS `type`,
                           `a`.`starttime` AS `starttime`,
                           `a`.`expiretime` AS `expiretime`,
                           `a`.`activetime` AS `activetime`,
@@ -217,6 +218,7 @@ class Account extends Base
 	                      `a`.`salt` AS `salt`,
 	                      `a`.`status` AS `status`,
                           `a`.`is_del` AS `is_del`,
+                          `a`.`type` AS `type`,
                           `a`.`starttime` AS `starttime`,
                           `a`.`expiretime` AS `expiretime`,
                           `a`.`activetime` AS `activetime`,

application/Admin/controller/Order.php

@@ -59,6 +59,7 @@ class Order extends Base
             ->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")
+            ->join("fc_good gd","a.good_id = gd.id","left")
             ->field("`a`.`id` AS `id`,
 	`a`.`order_sn` AS `order_sn`,
 	`a`.`accountid` AS `accountid`,
@@ -85,7 +86,10 @@ class Order extends Base
 	`g`.`nickname` AS `nickname`,
 	`g`.`mobile` AS `mobile`,
 	`a`.`unit_weight` AS `unit_weight`,
-	`a`.`unit` AS `unit`
+	`a`.`unit` AS `unit`,
+	 gd.good_name as 'good_name',
+     gd.good_desc as 'good_name',
+     gd.good_url as 'good_url'
 	")
             ->order("order_time desc")
             ->select();

application/Home/controller/Order.php

@@ -33,6 +33,7 @@ class Order extends Base
             ->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")
+            ->join("fc_good gd","a.good_id = gd.id","left")
             ->field("a.id AS id,
 	a.`order_sn` AS `order_sn`,
 	a.`accountid` AS `accountid`,
@@ -59,7 +60,10 @@ class Order extends Base
 	`g`.`nickname` AS `nickname`,
 	`g`.`mobile` AS `mobile`,
 	a.`unit_weight` AS `unit_weight`,
-	a.`unit` AS `unit`")->select();
+	a.`unit` AS `unit`,
+	  gd.good_name as 'good_name',
+                          gd.good_desc as 'good_name',
+                          gd.good_url as 'good_url'")->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
@@ -80,6 +84,7 @@ class Order extends Base
             ->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")
+            ->join("fc_good gd","a.good_id = gd.id","left")
             ->field("`a`.`id` AS `id`,
                         `a`.`order_sn` AS `order_sn`,
                         `a`.`accountid` AS `accountid`,
@@ -106,9 +111,12 @@ class Order extends Base
                         `g`.`nickname` AS `nickname`,
                         `g`.`mobile` AS `mobile`,
                         `a`.`unit_weight` AS `unit_weight`,
-                        `a`.`unit` AS `unit` ")
+                        `a`.`unit` AS `unit`,
+                          gd.good_name as 'good_name',
+                          gd.good_desc as 'good_name',
+                          gd.good_url as 'good_url'
+                        ")
             ->find();
-        //var_dump($order);
         if(empty($order)){
             return error_show(1005,"未找到订单数据");
         }
@@ -120,9 +128,10 @@ class Order extends Base
      * @param  addrid
      */
     public function ist(){
-      $ist = Db::name('unit')->where(["is_del" => 0,"status"=>1])->field("id,name,weight")->select();
+      $ist = Db::name('unit')->where(["is_del" => 0,"status"=>1,"type"=>$this->userinfo['type']])->field("id,good_name,good_desc,,good_url,unit as name, unit_weight as weight,limit_num")->select();
       return app_show(0,"获取成功",["list"=>$ist]);
     }
+
     public function add(){
         $num = isset($this->post['num'])&&$this->post['num']!="" ? intval($this->post['num']):"";
         if($num==""){
@@ -132,10 +141,10 @@ class Order extends Base
         if($id==""){
             return error_show(1004,"unit_id不能为空");
         }
-        $kg= Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->field("id,name,weight,limit_num")->find();
+        $kg= Db::name('good')->where(["is_del" => 0,"id"=>$id,"status"=>1,"type"=>$this->userinfo['type']])->field("id,good_name,good_desc,,good_url,unit as name, unit_weight as 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,"单位不能为空");
+        if($kg==false){
+            return error_show(1004,"商品未找到");
         }
         $count=$num*$kg['weight'];
         if($count==""){
@@ -143,7 +152,6 @@ class Order extends Base
         }
         if($kg['limit_num']>0){
             $zl = Db::name('order_log')->where(["unit_id"=>$id,"accountid"=>$this->userinfo['id']])->sum('num');
-          // var_dump(Db::name('order_log')->getLastSql());
 
             if($zl+$num>$kg['limit_num']){
                 $jf = $kg['limit_num']>=$zl ?$kg['limit_num']-$zl :0;
@@ -174,6 +182,7 @@ class Order extends Base
                 "order_num"=>$num,
                 "unit"=>$kg['name'],
                 "unit_weight"=>$kg['weight'],
+                "good_id"=>$kg['id'],
                 "is_del"=>0,
                 "status"=>1,
                 "addtime"=>date("Y-m-d H:i:s"),
@@ -240,7 +249,8 @@ class Order extends Base
         $stock = Db::name("account_stock")->where(["accountid"=>$this->userinfo['id'],'is_del'=>0])->find();
         $data=[];
         $data['stock'] = isset($stock['stock_balance']) ? $stock['stock_balance']:0;
-        $unit = Db::name('unit')->where(['is_del'=>0,'status'=>1])->field("id,name,weight,limit_num")->select();
+        $unit = Db::name('good')->where(['is_del'=>0,'status'=>1,"type"=>$this->userinfo['type']])->field("id,good_name,unit as name,unit_weight as weight,limit_num")
+            ->select();
         $limit=[];
         foreach ($unit as $value){
             $zl =0;