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

application/services/goods/GoodsService.php

@@ -342,7 +342,7 @@ class GoodsService
             throw new GoodsException(["cus" => 12]);
         }
         //驳回时候要有原因
-        if ($status == GoodsSku::STATUS_REJECT && empty($params["rejected_reason"])) {
+        if ($status == GoodsSku::STATUS_REJECT && strlen(trim($params["rejected_reason"])) == 0) {
             throw new GoodsException(["cus" => 9]);
         }
 
@@ -769,7 +769,7 @@ class GoodsService
                 }
             }
         }
-        $recordList = GoodsOperationRecord::select("*", ["goods_spu_id" => $goodsSpuId]);
+        $recordList = GoodsOperationRecord::select("*", ["goods_spu_id" => $goodsSpuId, "ORDER"=>["create_time"=>"DESC"]]);
         if (!empty($recordList)) {
             foreach ($recordList as $key => $record) {
                 $data["record_list"][$key]["status"] = $record["goods_status"];