update:修改u_id为user_id

application/library/Validate/GoodsAddValidate.php

@@ -22,7 +22,7 @@ class GoodsAddValidate extends BaseValidate
         'inventory_add' => 'require',
         'life_account_id' => 'require',
         'merchant_id' => 'require',
-        'u_id' => 'require',
+        'user_id' => 'require',
     ];
 
     protected $message = [
@@ -36,6 +36,6 @@ class GoodsAddValidate extends BaseValidate
         'inventory_add' => '请填写库存',
         'life_account_id' => 'life_account_id 不能为空',
         'merchant_id' => 'merchant_id 不能为空',
-        'u_id' => 'u_id 不能为空',
+        'user_id' => 'user_id 不能为空',
     ];
 }
\ No newline at end of file

application/library/Validate/GoodsAuditValidate.php

@@ -14,14 +14,10 @@ class GoodsAuditValidate extends BaseValidate
     protected $rule = [
         'goods_spu_id' => 'require',
         'status' => 'require',
-        'uid' => 'require',
-        'username' => 'require',
     ];
 
     protected $message = [
         "goods_spu_id" => "商品id不能为空",
         "status" => "商品审核状态不能为空",
-        "uid" => "用户id不能为空",
-        "username" => "用户username不能为空",
     ];
 }
\ No newline at end of file

application/library/Validate/GoodsOnlineOfflineValidate.php

+<?php
+
+
+namespace Validate;
+
+
+/**
+ * Class GoodsOnlineOfflineValidate
+ *
+ * @package Validate
+ */
+class GoodsOnlineOfflineValidate extends BaseValidate
+{
+    protected $rule = [
+        'goods_spu_id' => 'require',
+        'online_status' => 'require',
+    ];
+
+    protected $message = [
+        "goods_spu_id" => "商品id不能为空",
+        "online_status" => "商品审核状态不能为空",
+    ];
+}
\ No newline at end of file

application/modules/Goods/controllers/Goods.php

@@ -10,6 +10,7 @@ use \Validate\GoodsEditValidate;
 use \Validate\GoodsInfoOpValidate;
 use \Validate\GoodsInfoFeValidate;
 use \Validate\GoodsListCValidate;
+use \Validate\GoodsOnlineOfflineValidate;
 use \App\Services\goods\ElasticGoodService;
 
 
@@ -79,7 +80,7 @@ class GoodsController extends Base
      */
     public function online_offlineAction()
     {
-        (new GoodsAuditValidate())->validate();
+        (new GoodsOnlineOfflineValidate())->validate();
 
         $params = $this->params;
         GoodsService::onlineOrOffline($params);

application/services/goods/GoodsService.php

@@ -5,6 +5,7 @@ namespace App\Services\goods;
 
 
 use Api\PhpServices\Idgen\Idgen;
+use Api\PhpServices\Sensitive\Sensitive;
 use Api\PhpUtils\Common\BaseConvert;
 use App\Exception\custom\GoodsException;
 use App\Models\goods\mysql\Category;
@@ -73,7 +74,7 @@ class GoodsService
             "goods_operation_record_id" => $res[0],
             "goods_spu_id" => $spuId,
             "goods_sku_id" => $skuId,
-            "operator_id" => $params["u_id"],
+            "operator_id" => $params["user_id"],
             "operator_name" => $params["user_name"],
             "goods_status" => GoodsSku::STATUS_AUDIT,
             "online_status" => GoodsSku::ONLINE_STATUS_NO_ONLINE,
@@ -112,7 +113,7 @@ class GoodsService
             "goods_spu_id" => $spuId,
             "shop_id" => $shopId,
             "life_account_id" => $spuData["life_account_id"],
-            "u_id" => $spuData["u_id"],
+            "user_id" => $spuData["user_id"],
             "name" => $spuData["name"],
             "url" => $spuData["url"],
             "desc" => $spuData["desc"],
@@ -151,7 +152,7 @@ class GoodsService
             "goods_spu_id" => $spuId,
             "life_account_id" => $skuData["life_account_id"],
             "shop_id" => $shopId,
-            "u_id" => $skuData["u_id"],
+            "user_id" => $skuData["user_id"],
             "category_1_id" => $skuData["category_1_id"],
             "category_2_id" => $skuData["category_2_id"],
             "name" => $skuData["name"],
@@ -216,10 +217,13 @@ class GoodsService
     {
         $goodsSpuId = $params["goods_spu_id"];
         $status = $params["status"];
-        $operatorId = $params["uid"];
-        $operatorName = $params["username"];
+        $operatorId = $params["user_id"];
+        $operatorName = $params["user_name"];
 
         $goodsSpu = GoodsSpu::get("*", ["goods_spu_id" => $goodsSpuId]);
+        if (empty($goodsSpu)) {
+            throw new GoodsException(["cus" => 15]);
+        }
         //todo::权限判断 商品所属 life_account_id 或者 后台管理员
         //权限判断
         if (!empty($params["life_account_id"]) && $goodsSpu["life_account_id"] != $params["life_account_id"]) {
@@ -286,8 +290,8 @@ class GoodsService
     {
         $goodsSpuId = $params["goods_spu_id"];
         $onlineStatus = $params["online_status"];
-        $operatorId = $params["uid"];
-        $operatorName = $params["username"];
+        $operatorId = $params["user_id"];
+        $operatorName = $params["user_name"];
 
         $goodsSpu = GoodsSpu::get("*", ["goods_spu_id" => $goodsSpuId]);
         //todo::权限判断 商品所属 life_account_id 或者 后台管理员
@@ -471,7 +475,7 @@ class GoodsService
             "goods_operation_record_id" => $res[0],
             "goods_spu_id" => $skuData["goods_spu_id"],
             "goods_sku_id" => $goodsSkuId,
-            "operator_id" => $params["u_id"],
+            "operator_id" => $params["user_id"],
             "operator_name" => $params["user_name"],
             "goods_status" => GoodsSku::STATUS_AUDIT,
             "online_status" => GoodsSku::ONLINE_STATUS_NO_ONLINE,
@@ -600,7 +604,7 @@ class GoodsService
         $where['ORDER'] = ["create_time" => "DESC"];
 
         $list = GoodsSku::select(["goods_spu_id", "goods_sku_id", "name", "category_1_id", "category_2_id", "life_account_id",
-            "u_id", "update_time", "create_time", "status", "online_status"],
+            "user_id", "update_time", "create_time", "status", "online_status"],
             $where);
         return ["list" => $list, "count" => $count];
     }
@@ -719,4 +723,27 @@ class GoodsService
         }
         return false;
     }
+
+    /**
+     * 敏感词检查
+     * $text 送查内容
+     * $scene 场景ID 1.标题 2.简介 3.正文 4.评论 6.昵称 7.搜索
+     * $businessId 1.一点 2.身边 9.VPN
+     * @param $text
+     * @param $scene
+     * @param int $businessId
+     * @return bool|mixed
+     * @throws \App\Exception\custom\CodeSpecialException
+     */
+    private function checkSensitive($text, $scene, $businessId = 1)
+    {
+        $params = [
+            'businessId' => $businessId,
+            'text' => $text,
+            'scene' => $scene,
+
+        ];
+
+        return (new Sensitive())->detect($params);
+    }
 }
\ No newline at end of file