update:商品调整name和stauts字段

application/services/goods/GoodsService.php

@@ -115,7 +115,7 @@ class GoodsService
             throw new GoodsException(['cus' => 2]);
         }
         $spuId = $res[0];
-        $checkName = self::checkGoodsName($spuData["name"], $spuData["life_account_id"]);
+        $checkName = self::checkGoodsName($spuData["goods_name"], $spuData["life_account_id"]);
         if (!$checkName["can_use"]) {
             throw new GoodsException(['cus' => 17]);
         }
@@ -125,7 +125,7 @@ class GoodsService
             "shop_id" => $shopId,
             "life_account_id" => $spuData["life_account_id"],
             "publish_user_id" => $spuData["user_id"],
-            "name" => $spuData["name"],
+            "goods_name" => $spuData["goods_name"],
             "url" => $spuData["url"],
             "desc" => $spuData["desc"],
             "goods_type" => GoodsSpu::TYPE_VIRTUAL,
@@ -158,7 +158,7 @@ class GoodsService
         if ($skuData["expiration_time"] < date("Y-m-d H:i:s")) {
             throw new GoodsException(['cus' => 16]);
         }
-        $checkGoodsName = self::isHaveSensitive($skuData["name"], 1);
+        $checkGoodsName = self::isHaveSensitive($skuData["goods_name"], 1);
         if ($checkGoodsName) {
             throw new GoodsException(['cus' => 19]);
         }
@@ -183,7 +183,7 @@ class GoodsService
             "publish_user_id" => $skuData["user_id"],
             "category_1_id" => $skuData["category_1_id"],
             "category_2_id" => $skuData["category_2_id"],
-            "name" => $skuData["name"],
+            "goods_name" => $skuData["goods_name"],
             "url" => $skuData["url"],
             "desc" => $skuData["desc"],
             "introduce" => $skuData["introduce"],
@@ -289,7 +289,7 @@ class GoodsService
     public static function audit($params = [])
     {
         $goodsSpuId = $params["goods_spu_id"];
-        $status = $params["status"];
+        $status = $params["audit_status"];
         $operatorId = empty($params["user_id"]) ? 0 : $params["user_id"];
         $operatorName = $params["user_name"];
 
@@ -316,12 +316,12 @@ class GoodsService
         $goodsSkuList = GoodsSku::select("*", ["goods_spu_id" => $goodsSpuId]);
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $sku) {
-                if ($sku["status"] == GoodsSku::STATUS_PASS || $sku["status"] == GoodsSku::STATUS_REJECT) {
+                if ($sku["audit_status"] == GoodsSku::STATUS_PASS || $sku["audit_status"] == GoodsSku::STATUS_REJECT) {
                     throw new GoodsException(["cus" => 10]);
                 }
                 $goodsSkuId = $sku["goods_sku_id"];
                 GoodsSku::save([
-                    "status" => $status,
+                    "audit_status" => $status,
                     "rejected_reason" => $params["rejected_reason"]
                 ], ["goods_sku_id" => $sku["goods_sku_id"]]);
 
@@ -382,7 +382,7 @@ class GoodsService
         $goodsSkuList = GoodsSku::select("*", ["goods_spu_id" => $goodsSpuId]);
         if (!empty($goodsSkuList)) {
             foreach ($goodsSkuList as $sku) {
-                if ($sku["status"] != GoodsSku::STATUS_PASS) {
+                if ($sku["audit_status"] != GoodsSku::STATUS_PASS) {
                     throw new GoodsException(["cus" => 14]);
                 }
                 $goodsSkuId = $sku["goods_sku_id"];
@@ -399,7 +399,7 @@ class GoodsService
                     "goods_sku_id" => $goodsSkuId,
                     "operator_id" => $operatorId,
                     "operator_name" => $operatorName,
-                    "goods_status" => $sku["status"],
+                    "goods_status" => $sku["audit_status"],
                     "online_status" => $onlineStatus,
                     "before_version" => $sku["goods_version"],
                     "after_version" => $sku["goods_version"],
@@ -441,9 +441,9 @@ class GoodsService
     public static function checkGoodsName($goodsName, $lifeAccountId, $goodsSpuId = 0)
     {
         if ($goodsSpuId) {
-            $sku = GoodsSpu::get("*", ["name" => $goodsName, "life_account_id" => $lifeAccountId, "goods_spu_id[!]" => $goodsSpuId]);
+            $sku = GoodsSpu::get("*", ["goods_name" => $goodsName, "life_account_id" => $lifeAccountId, "goods_spu_id[!]" => $goodsSpuId]);
         } else {
-            $sku = GoodsSpu::get("*", ["name" => $goodsName, "life_account_id" => $lifeAccountId]);
+            $sku = GoodsSpu::get("*", ["goods_name" => $goodsName, "life_account_id" => $lifeAccountId]);
         }
         $nameCanUse = false;
         if (empty($sku)) {
@@ -491,13 +491,13 @@ class GoodsService
      */
     private static function editGoodsSpu($goodsSpu, $params = [])
     {
-        $checkName = self::checkGoodsName($params["name"], $goodsSpu["life_account_id"], $goodsSpu["goods_spu_id"]);
+        $checkName = self::checkGoodsName($params["goods_name"], $goodsSpu["life_account_id"], $goodsSpu["goods_spu_id"]);
         if (!$checkName["can_use"]) {
             throw new GoodsException(['cus' => 17]);
         }
 
         return GoodsSpu::save([
-            "name" => $params["name"],
+            "goods_name" => $params["goods_name"],
             "url" => $params["url"],
             "desc" => $params["desc"],
             "goods_type" => GoodsSpu::TYPE_VIRTUAL,
@@ -525,7 +525,7 @@ class GoodsService
         if ($inventoryCount < 0) {
             throw new GoodsException(['cus' => 18]);
         }
-        $checkGoodsName = self::isHaveSensitive($params["name"], 1);
+        $checkGoodsName = self::isHaveSensitive($params["goods_name"], 1);
         if ($checkGoodsName) {
             throw new GoodsException(['cus' => 19]);
         }
@@ -549,7 +549,7 @@ class GoodsService
         $skuParams = [
             "category_1_id" => $params["category_1_id"],
             "category_2_id" => $params["category_2_id"],
-            "name" => $params["name"],
+            "goods_name" => $params["goods_name"],
             "url" => $params["url"],
             "desc" => $params["desc"],
             "introduce" => $skuData["introduce"],
@@ -565,7 +565,7 @@ class GoodsService
             "goods_version" => (int)$skuData["goods_version"] + 1,
         ];
         if (self::isInitGoodsStatus($params, $skuData)) {
-            $skuParams["status"] = GoodsSku::STATUS_AUDIT;
+            $skuParams["audit_status"] = GoodsSku::STATUS_AUDIT;
             $skuParams["online_status"] = GoodsSku::ONLINE_STATUS_NO_ONLINE;
         }
         if (!empty($params["setmeal"])) {
@@ -606,7 +606,7 @@ class GoodsService
     {
         return $params["category_1_id"] != $sku["category_1_id"]
             || $params["category_2_id"] != $sku["category_2_id"]
-            || $params["name"] != $sku["name"]
+            || $params["goods_name"] != $sku["goods_name"]
             || $params["url"] != $sku["url"]
             || $params["desc"] != $sku["desc"]
             || $params["introduce"] != $sku["introduce"]
@@ -688,7 +688,7 @@ class GoodsService
     public static function getGoodsSkuInfo($params = [])
     {
         $data = [];
-        $sku = GoodsSku::get(["goods_sku_id", "category_1_id", "category_2_id", "name", "url", "desc", "introduce"
+        $sku = GoodsSku::get(["goods_sku_id", "category_1_id", "category_2_id", "goods_name", "url", "desc", "introduce"
                 , "introduce_pic_url", "expiration_time", "rule_limit", "rule_desc", "rule_refund", "inventory_rest"
                 , "total_amount_sold", "original_price", "price"]
             , ["goods_sku_id" => $params["goods_sku_id"]]);
@@ -748,8 +748,8 @@ class GoodsService
         if (!empty($params["goods_spu_id"])) {
             $where["goods_spu_id"] = $params["goods_spu_id"];
         }
-        if (!empty($params["name"])) {
-            $where["name"] = $params["name"];
+        if (!empty($params["goods_name"])) {
+            $where["goods_name"] = $params["goods_name"];
         }
         if (!empty($params["category_1_id"])) {
             $category1Ids = explode(",", $params["category_1_id"]);
@@ -762,9 +762,9 @@ class GoodsService
         if (!empty($params["life_account_id"])) {
             $where["life_account_id"] = $params["life_account_id"];
         }
-        if (!empty($params["status"])) {
-            $status = explode(",", $params["status"]);
-            $where["status"] = $status;
+        if (!empty($params["audit_status"])) {
+            $status = explode(",", $params["audit_status"]);
+            $where["audit_status"] = $status;
         }
         if (!empty($params["online_status"])) {
             $onlineStatus = explode(",", $params["online_status"]);
@@ -776,8 +776,8 @@ class GoodsService
         $where['LIMIT'] = [$page, $limit];
         $where['ORDER'] = ["create_time" => "DESC"];
 
-        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "name", "category_1_id", "category_2_id", "life_account_id",
-            "publish_user_id", "update_time", "create_time", "status", "online_status"],
+        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "category_1_id", "category_2_id", "life_account_id",
+            "publish_user_id", "update_time", "create_time", "audit_status", "online_status"],
             $where);
         if (!empty($list)) {
             foreach ($list as $key => $item) {
@@ -815,12 +815,12 @@ class GoodsService
 
         $where = [];
         if ($type == "online") {
-            $where["status"] = GoodsSku::STATUS_PASS;
+            $where["audit_status"] = GoodsSku::STATUS_PASS;
             $where["online_status"] = GoodsSku::ONLINE_STATUS_ONLINE;
         } else if ($type == "auditing") {
-            $where["status"] = GoodsSku::STATUS_AUDIT;
+            $where["audit_status"] = GoodsSku::STATUS_AUDIT;
         } else if ($type == "rejected") {
-            $where["status"] = GoodsSku::STATUS_REJECT;
+            $where["audit_status"] = GoodsSku::STATUS_REJECT;
         } else if ($type == "offline") {
             $where["online_status"] = GoodsSku::ONLINE_STATUS_OFFLINE;
         }
@@ -831,8 +831,8 @@ class GoodsService
         $where["life_account_id"] = $lifeAccountId;
         $where["LIMIT"] = $limit;
         $where["ORDER"] = ["goods_spu_id" => "ASC"];
-        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "name", "url", "total_amount_sold", "inventory_rest", "original_price",
-            "price", "status", "online_status"], $where);
+        $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "goods_name", "url", "total_amount_sold", "inventory_rest", "original_price",
+            "price", "audit_status", "online_status"], $where);
 
         $data = [];
         if (!empty($list)) {
@@ -861,13 +861,13 @@ class GoodsService
             "doc" => [
                 "id" => $skuData["goods_sku_id"],
                 "goods_pic" => $skuParams["url"],
-                "name" => $skuParams["name"],
+                "goods_name" => $skuParams["goods_name"],
                 "inventory_rest" => $skuParams["inventory_rest"],
                 "total_amount_sold" => $skuData["total_amount_sold"],
                 "original_price" => $skuParams["original_price"] / 100,
                 "price" => $skuParams["price"] / 100,
                 "price_sort" => (int)$skuParams["price"],
-                "status" => $skuData["status"],
+                "audit_status" => $skuData["audit_status"],
                 "online_status" => $skuData["online_status"],
                 "desc" => $skuData["desc"],
                 "category_1_name" => $nameList[0],
@@ -888,13 +888,13 @@ class GoodsService
         $data = [
             "id" => $skuParams["goods_sku_id"],
             "goods_pic" => $skuParams["url"],
-            "name" => $skuParams["name"],
+            "goods_name" => $skuParams["goods_name"],
             "inventory_rest" => $skuParams["inventory_rest"],
             "total_amount_sold" => 0,
             "original_price" => $skuParams["original_price"] / 100,
             "price" => $skuParams["price"] / 100,
             "price_sort" => (int)$skuParams["price"],
-            "status" => GoodsSku::STATUS_AUDIT,
+            "audit_status" => GoodsSku::STATUS_AUDIT,
             "online_status" => GoodsSku::ONLINE_STATUS_NO_ONLINE,
             "desc" => $skuParams["desc"],
             "category_1_name" => $nameList[0],
@@ -968,7 +968,7 @@ class GoodsService
             throw new GoodsException(["cus" => 23]);
         }
 
-        $data["name"] = $goodsSnapshot["name"];
+        $data["goods_name"] = $goodsSnapshot["goods_name"];
         $nameList = Category::select("name", ["category_id" => [$goodsSnapshot["category_1_id"], $goodsSnapshot["category_2_id"]]]);
         $data["category_1_name"] = $nameList[0];
         $data["category_2_name"] = $nameList[1];