Merge branch 'develop' of https://gitlab.yidian-inc.com/bp/goods into develop

application/library/Validate/GoodsAddValidate.php

@@ -17,7 +17,6 @@ class GoodsAddValidate extends BaseValidate
         'category_2_id' => 'require',
         'desc' => 'length:0,50',
         'desc_pic_url' => 'require',
-        'original_price' => 'require',
         'price' => 'require',
         'expiration_time' => 'require',
         'sub_shop_ids' => 'require',
@@ -32,7 +31,6 @@ class GoodsAddValidate extends BaseValidate
         'category_2_id' => '请选择所属类目',
         'desc' => '商品说明内容不能过长',
         'desc_pic_url' => '请上传商品图片',
-        'original_price' => '请填写原价',
         'price' => '请填写售价',
         'expiration_time' => '请填写到期时间',
         'sub_shop_ids' => '门店id不能为空',

application/library/Validate/GoodsEditValidate.php

@@ -17,7 +17,6 @@ class GoodsEditValidate extends BaseValidate
         'category_2_id' => 'require',
         'desc' => 'length:0,50',
         'desc_pic_url' => 'require',
-        'original_price' => 'require',
         'price' => 'require',
         'expiration_time' => 'require',
         'sub_shop_ids' => 'require',
@@ -31,7 +30,6 @@ class GoodsEditValidate extends BaseValidate
         'category_2_id' => '请选择所属类目',
         'desc' => '商品说明内容不能过长',
         'desc_pic_url' => '请上传商品图片',
-        'original_price' => '请填写原价',
         'price' => '请填写售价',
         'expiration_time' => '请填写到期时间',
         'sub_shop_ids' => '门店id不能为空',

application/modules/Cli/controllers/GoodsToEs.php

@@ -85,6 +85,8 @@ class GoodsToEsController extends Cli
                     "audit_status" => $goodsSkuInfo["audit_status"],
                     "online_status" => $goodsSkuInfo["online_status"],
                     "desc" => $goodsSkuInfo["desc"],
+                    "category_1_id" => $goodsSkuInfo["category_1_id"],
+                    "category_2_id" => $goodsSkuInfo["category_2_id"],
                     "category_1_name" => $nameList[0],
                     "category_2_name" => $nameList[1],
                     "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],

application/modules/Goods/controllers/Goods.php

@@ -28,6 +28,16 @@ class GoodsController extends Base
         $this->success(["result" => $categoryList]);
     }
 
+    /**
+     * 一级商品分类数据
+     * @throws Exception
+     */
+    public function get_level_one_category_listAction()
+    {
+        $categoryList = CategoryService::getLevelOneCategory();
+        $this->success(["result" => $categoryList]);
+    }
+
     /**
      * 增加商品
      */

application/services/goods/CategoryService.php

@@ -46,4 +46,13 @@ class CategoryService
         }
         return $data;
     }
+
+    /**
+     * 查询一级商品分类
+     * @return \Api\PhpUtils\Mysql\MysqlBase
+     */
+    public static function getLevelOneCategory()
+    {
+        return Category::getRecordList(["level"=>Category::LEVEL_1], ['category_id', 'name']);
+    }
 }
\ No newline at end of file

application/services/goods/GoodsService.php

@@ -945,6 +945,8 @@ class GoodsService
                                 "audit_status" => $goodsSkuInfo["audit_status"],
                                 "online_status" => $goodsSkuInfo["online_status"],
                                 "desc" => $goodsSkuInfo["desc"],
+                                "category_1_id" => $goodsSkuInfo["category_1_id"],
+                                "category_2_id" => $goodsSkuInfo["category_2_id"],
                                 "category_1_name" => $nameList[0],
                                 "category_2_name" => $nameList[1],
                                 "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],
@@ -993,6 +995,8 @@ class GoodsService
             "audit_status" => GoodsSku::STATUS_AUDIT,
             "online_status" => GoodsSku::ONLINE_STATUS_NO_ONLINE,
             "desc" => $skuParams["desc"],
+            "category_1_id" => $skuParams["category_1_id"],
+            "category_2_id" => $skuParams["category_2_id"],
             "category_1_name" => $nameList[0],
             "category_2_name" => $nameList[1],
             "life_account_name" => empty($lifeAccountRes["response"]["result"]["life_account_name"]) ? "" : $lifeAccountRes["response"]["result"]["life_account_name"],