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

app/admin/controller/Goodup.php

@@ -1598,7 +1598,7 @@ class Goodup extends Base
     }
 
     /**
-     *
+     * 已下线商品重新发起上线
      */
     public function againOnline(){
         $skuCode = isset($this->post['skuCode'])&&$this->post['skuCode']!==""?trim($this->post['skuCode']):"";
@@ -1662,6 +1662,21 @@ class Goodup extends Base
                 ];
                 $inr=Db::name("good_exam")->insert($data);
                 if($inr){
+
+                    //将good_basic数据同步到good表
+                    $good_basic = Db::name('good_basic')
+                        ->where(['spuCode' => $platform['spuCode'], 'is_del' => 0])
+                        ->find();
+
+                    if (!empty($good_basic)) {
+                        unset($good_basic['id']);
+                        unset($good_basic['addtime']);
+                        $good_basic['updatetime'] = date('Y-m-d H:i:s');
+                        Db::name('good')
+                            ->where(['spuCode' => $platform['spuCode'], 'is_del' => 0])
+                            ->update($good_basic);
+                    }
+
                     Db::commit();
                     return app_show(0,"审核成功");
                 }