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

application/services/marketing/MarketingGoodsService.php

@@ -63,7 +63,7 @@ class MarketingGoodsService
         $where['ORDER'] = ["create_time" => "DESC"];
         
     	$marketingWhere = [
-			"expiration_time[>]" => date("Y-m-d"),
+			"end_time[>]" => date("Y-m-d"),
 			"online_status" => 1,
     	];
     	$marketingList = Marketing::getMarketingList($marketingWhere);

daemon/Goods.php

@@ -6,6 +6,7 @@ namespace Daemon;
 
 use Api\PhpServices\Daemon\DaemonServiceInterface;
 use App\Models\goods\mysql\GoodsSku;
+use Api\PhpUtils\Log\FileLog;
 class Goods implements DaemonServiceInterface
 {
 	public function __construct(int $mid)
@@ -21,6 +22,7 @@ class Goods implements DaemonServiceInterface
             'expiration_time[<]' => date("Y-m-d H:i:s",time())
         ];
         $goodsList = GoodsSku::getRecords($orderData);
+        FileLog::info('DaemonServiceInterface_goods', json_encode($goodsList));
         foreach ($goodsList as $key => $value) {
             $where = [];
             $where['goods_sku_id'] = !empty($value['goods_sku_id']) ? $value['goods_sku_id'] : '';