Merge branch 'marketing_20210824' into test

application/services/marketing/MarketingGoodsService.php

@@ -52,7 +52,8 @@ class MarketingGoodsService
     }
     public static function marketingGoodsList($params)
     {   
-        $limit = !empty($params['num']) ? $params['num'] : 20;
+        //@todo 分页放大100倍,主要解决商品到期和商品库存为零的过滤场景
+        $limit = !empty($params['num']) ? $params['num']*100 : 20;
 
         $userId = !empty($params['user_id']) ? $params['user_id'] : '';
 
@@ -108,7 +109,7 @@ class MarketingGoodsService
 
                 $onlineStatus = !empty($goodsSkuList[$value['goods_sku_id']]['online_status']) ? $goodsSkuList[$value['goods_sku_id']]['online_status'] : '';
 
-                if (!empty($inventoryRest) && $expirationTime> date("Y-m-d H:i:s") && $onlineStatus == 1 ) {
+                if (!empty($inventoryRest) && $expirationTime > date("Y-m-d H:i:s") && $onlineStatus == 1 ) {
                     $list[$i]['inventory_rest'] = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
                     $list[$i] = $value;
                     $list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';