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

application/services/goods/GoodsService.php

@@ -355,7 +355,7 @@ class GoodsService
                 }
                 $goodsSkuId = $sku["goods_sku_id"];
 
-                $rejectedReason = empty($params["rejected_reason"]) ? "" : $params["rejected_reason"];
+                $rejectedReason = strlen(trim($params["rejected_reason"])) == 0 ? "" : $params["rejected_reason"];
                 if ($status == GoodsSku::STATUS_PASS) {
                     $statusData = [
                         "online_status" => GoodsSku::ONLINE_STATUS_ONLINE,
@@ -975,6 +975,7 @@ class GoodsService
 
         $data = [];
         if (!empty($list)) {
+            $count = count($list);
             foreach ($list as $key => $sku) {
                 $sku["original_price"] = $sku["original_price"] / 100;
                 $sku["price"] = $sku["price"] / 100;
@@ -986,6 +987,9 @@ class GoodsService
                 }
                 $lastId = $sku["goods_spu_id"];
             }
+            if ($count < $limit) {
+                $lastId = "-1";
+            }
         } else {
             $lastId = "-1";
         }