Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ProductController.php

@@ -431,6 +431,25 @@ class ProductController extends BaseController
     public function actionCopy()
     {
         $id = Yii::$app->request->get('id');
+        $productData = ProductClass::getById($id);
+        if(!$productData){
+            util::fail("花材不存在");
+        }
+        if($productData['shopId'] != $this->shopId){
+            //
+            util::fail("无效花材");
+        }
+        //去除无用的字段
+        unset($productData['stock']); //库存去掉
+        unset($productData['viewNum']);
+        unset($productData['actualSold']);
+        unset($productData['itemId']);
+        unset($productData['id']);
+        unset($productData['delStatus']);
+
+        $productData['copy'] = 1; //复制标识
+        ProductClass::addProduct($productData);
+
         util::complete();
     }
 

biz-ghs/product/classes/ProductClass.php

@@ -915,7 +915,7 @@ class ProductClass extends BaseClass
         }
         if ($stock == 0) {
             //下架
-            $data['delStatus'] = 1;
+            $data['status'] = 2;
         }
         if (!$classId) {
             util::fail("请选择分类");