update:处理冲突

application/services/common/CommonService.php

@@ -39,7 +39,7 @@ class CommonService
         $params['life_account_ids'] = implode(',', $lifeAccountId);
         $res = (new Request())->get($url, $params);
         if ($res['code'] == 0 && isset($res['response'])) {  
-            return $res['response']['result'];
+            return !empty($res['response']['result']) ? $res['response']['result'] : [];
         }
         return [];
     }

application/services/marketing/MarketingGoodsService.php

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

daemon/Goods.php

@@ -9,7 +9,7 @@ use App\Models\goods\mysql\GoodsSku;
 use App\Services\goods\GoodsService;
 use Api\PhpUtils\Log\DaemonLog;
 class Goods implements DaemonServiceInterface
-
+{
     public function run()
     {
         sleep(2);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2::getLoader();
+return ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5::getLoader();

vendor/composer/InstalledVersions.php

@@ -27,12 +27,12 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'dev-develop',
+    'version' => 'dev-develop',
     'aliases' => 
     array (
     ),
-    'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
+    'reference' => '878a33618ec71ce36e62220c8e1be7e813733fe3',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -327,12 +327,12 @@ private static $installed = array (
     ),
     'yidian/yaf_demo' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'dev-develop',
+      'version' => 'dev-develop',
       'aliases' => 
       array (
       ),
-      'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
+      'reference' => '878a33618ec71ce36e62220c8e1be7e813733fe3',
     ),
   ),
 );

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2
+class ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5
 {
     private static $loader;
 
@@ -24,15 +24,15 @@ class ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5871a7b0b10b793d91ef1c8029b23ea5', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -53,19 +53,19 @@ class ComposerAutoloaderInit90e85a2e64f8339192f3e91b8700b9f2
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire90e85a2e64f8339192f3e91b8700b9f2($fileIdentifier, $file);
+            composerRequire5871a7b0b10b793d91ef1c8029b23ea5($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire90e85a2e64f8339192f3e91b8700b9f2($fileIdentifier, $file)
+function composerRequire5871a7b0b10b793d91ef1c8029b23ea5($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
+class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -1280,9 +1280,9 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -1401,7 +1401,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -1573,7 +1573,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/main"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
             },
             "funding": [
                 {

vendor/composer/installed.php

 <?php return array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'dev-develop',
+    'version' => 'dev-develop',
     'aliases' => 
     array (
     ),
-    'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
+    'reference' => '878a33618ec71ce36e62220c8e1be7e813733fe3',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -301,12 +301,12 @@
     ),
     'yidian/yaf_demo' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'dev-develop',
+      'version' => 'dev-develop',
       'aliases' => 
       array (
       ),
-      'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
+      'reference' => '878a33618ec71ce36e62220c8e1be7e813733fe3',
     ),
   ),
 );

vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php

@@ -78,7 +78,6 @@ class CurlFactory implements CurlFactoryInterface
             curl_reset($resource);
             $this->handles[] = $resource;
         }
-        curl_close($resource);
     }
 
     /**