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

application/services/goods/GoodsService.php

@@ -181,10 +181,13 @@ class GoodsService
         if ($checkGoodsDesc) {
             throw new GoodsException(['cus' => 20]);
         }
-        $checkGoodsIntroduce = self::isHaveSensitive($skuData["introduce"], 3);
-        if ($checkGoodsIntroduce) {
-            throw new GoodsException(['cus' => 21]);
+        if (!empty($skuData["introduce"])) {
+            $checkGoodsIntroduce = self::isHaveSensitive($skuData["introduce"], 3);
+            if ($checkGoodsIntroduce) {
+                throw new GoodsException(['cus' => 21]);
+            }
         }
+
         $checkGoodsRuleDesc = self::isHaveSensitive($skuData["rule_desc"], 2);
         if ($checkGoodsRuleDesc) {
             throw new GoodsException(['cus' => 22]);
@@ -1203,7 +1206,7 @@ class GoodsService
         }
         $info = GoodsSku::getRecord($where);
 
-        $info['original_price'] = $info['original_price']/100;
+        $info['original_price'] = empty($info['original_price']) ? 0 : $info['original_price']/100;
         $info['price'] = $info['price']/100;
         $info['desc_pic_url'] = self::getUrlList($info['desc_pic_url']);
         $info['introduce_pic_url'] = self::getUrlList($info['introduce_pic_url']);