Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Good.php

@@ -119,8 +119,13 @@ class Good extends Base
             ->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)->page
-        ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status")
+        $list = Db::name('good')
+            ->alias("a")
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.exam_status,gn.creater_id purchase_id,gn.creater purchase")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
+            ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->leftJoin("good_nake gn","gn.spuCode=a.spuCode")
+            ->where($where)
+            ->page($page,$size)
             ->order("b.addtime desc")
             ->select();
         $data=[];

app/admin/controller/Goodup.php

@@ -426,6 +426,8 @@ class Goodup extends Base
                         }else{
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
+                        $lemp['creater_id'] = $createrid;
+                        $lemp['creater'] = $creater;
                         $lemp['is_del'] = 0;
                         $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
@@ -743,6 +745,9 @@ class Goodup extends Base
                 ChangeLog::logAdd(3,$datas['spuCode'],$jsp,$json,$this->post['token'],$this->post);
                 $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save(["is_online"=>0,"status"=>0,"updatetime"=>date("Y-m-d H:i:s")]);
                 if($good_ladder!=="" && !empty($good_ladder)){
+
+                    $user =GetUserInfo($this->post['token']);
+
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         isset($value["id"])&&$value["id"]!=''?$lemp['id']=$value['id']:"";
@@ -764,6 +769,8 @@ class Goodup extends Base
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
+                        $lemp['createrid'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+                        $lemp['creater'] =isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
                         $count = Db::name("good_nake")->save($lemp);
@@ -1322,6 +1329,8 @@ class Goodup extends Base
                     $tmp['package_fee'] = $value['package_fee'];
                     $tmp['other_fee'] = $value['other_fee'];
                     $tmp['nake_total'] =$value['nake_total'];
+                    $tmp['creater_id']=$createrid;
+                    $tmp['creater']=$creater;
                     $tmp['is_del']=$value['is_del'];
                     $tmp['addtime']=date("Y-m-d H:i:s");
                     $tmp['updatetime']=date("Y-m-d H:i:s");
@@ -1638,6 +1647,9 @@ class Goodup extends Base
                     }
                 }
                 if($good_ladder!=="" && !empty($good_ladder)){
+
+                    $user =GetUserInfo($this->post['token']);//获取用户信息，下面更新成本表的创建人
+
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         isset($value["id"])&&$value["id"]!=''?$lemp['id']=$value['id']:"";
@@ -1659,6 +1671,8 @@ class Goodup extends Base
                         }else{
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
+                        $lemp['creater_id'] = isset($user["data"]['id']) ? $user["data"]['id'] : 0;
+                        $lemp['creater'] = isset($user["data"]['nickname']) ? $user["data"]['nickname'] : "";
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");