update:php-utils 更新

5fad960a · luhongguang · ec360a59 · 5fad960a · 5fad960a · 5fad960a
Commit 5fad960a authored Aug 06, 2021 by luhongguang
12 changed files
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 	"require": {
 		"php": "7.2.*",
 		"ext-json": "*",
-		"api/php_utils":"1.0.2",
+		"api/php_utils":"1.0.6",
 		"api/php_services":"1.0.1",
      	"ext-openssl": "*"
 	},

--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "daa627acc982a77331e871727e642792",
+    "content-hash": "1a4f3ce8dedec1cb91d3fe8719dc4436",
    "packages": [
        {
            "name": "api/php_services",
@@ -30,11 +30,11 @@
        },
        {
            "name": "api/php_utils",
-            "version": "v1.0.1",
+            "version": "v1.0.6",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "26abffd9afc5b90b7f42f10cf21813bbc3dd4f2d"
+                "reference": "8e8e414961ea10f32b79dbaeeb60d9e441a97ad6"
            },
            "require": {
                "elasticsearch/elasticsearch": "~7.0",
@@ -53,7 +53,7 @@
                }
            },
            "description": "bp api php_utils",
-            "time": "2021-08-02T13:20:23+00:00"
+            "time": "2021-08-06T16:38:16+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -1131,12 +1131,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e"
+                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a603e5701bd6e305cfc777a8b50bf081ef73105e",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e",
+                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e",
                "shasum": ""
            },
            "require": {
@@ -1176,7 +1176,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/5.4"
+                "source": "https://github.com/symfony/options-resolver/tree/5.3"
            },
            "funding": [
                {
@@ -1192,7 +1192,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-07-23T15:55:36+00:00"
+            "time": "2021-08-04T21:20:46+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -1692,12 +1692,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/property-access.git",
-                "reference": "12e1e517a315fa3a108dfcd3674e31542055d133"
+                "reference": "d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/12e1e517a315fa3a108dfcd3674e31542055d133",
-                "reference": "12e1e517a315fa3a108dfcd3674e31542055d133",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b",
+                "reference": "d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b",
                "shasum": ""
            },
            "require": {
@@ -1765,7 +1765,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-07-21T12:43:48+00:00"
+            "time": "2021-08-04T21:21:08+00:00"
        },
        {
            "name": "symfony/property-info",

--- a/vendor/api/php_utils/src/Log/FileLog.php
+++ b/vendor/api/php_utils/src/Log/FileLog.php
@@ -62,21 +62,10 @@ class FileLog
            $exception_info = '';
        }
        $log .= ' [exception info: ]' . $exception_info;
+        $log .= ' [debug_backtrace info: ]' . print_r(debug_backtrace(), 1);
        error_log($log);
        if (empty($mail_to)) {
-            $mail_to = [
-                'wangdanfeng@yidian-inc.com',
-                'cuiweifeng@yidian-inc.com',
-                'luhongguang@yidian-inc.com',
-                'wangdong1@yidian-inc.com',
-                'wanjilong@yidian-inc.com',
-                'jianghaiming@yidian-inc.com',
-                'songxiaohang@yidian-inc.com',
-                'genghongfei@yidian-inc.com',
-                'mengweifu@yidian-inc.com',
-                'guozhiyuan@yidian-inc.com',
-                'suntengda@yidian-inc.com'
-            ];
+            $mail_to = 'bp-server@yidian-inc.com';
        }
        $subject = 'App api #' . $signature . '# ' . $_SERVER['SERVER_NAME'] . ' (' . $_SERVER['SERVER_ADDR'] . ') Alert Message';
        $body = 'Error: ' . $signature . "\n\n";

--- a/vendor/api/php_utils/src/Message/Email.php
+++ b/vendor/api/php_utils/src/Message/Email.php
@@ -2,6 +2,8 @@

 namespace Api\PhpUtils\Message;

+use Yaf\Application;
+
 class Email
 {
    /**
@@ -19,6 +21,10 @@ class Email
        if (empty($to)) {
            return false;
        }
+        $env = Application::app()->environ();
+        if($env != 'test' && $env != 'prod' && $env != 'perf'){
+            return false;
+        }
        if (empty($from)) {
            $from = 'noreply@yidian-inc.com';
        }
@@ -30,6 +36,16 @@ class Email

            fwrite($sock, "HELO " . $domain . "\r\n");
            fgets($sock);
+
+            fwrite($sock, "auth login\r\n");
+            fgets($sock);
+
+            fwrite($sock, "YnAtbm9yZXBseQ==\r\n");
+            fgets($sock);
+
+            fwrite($sock, "VlhObGNtNWhiJFclVTY=\r\n");
+            fgets($sock);
+
            fwrite($sock, "MAIL FROM:<" . $from . ">\r\n");
            fgets($sock);
            if (!is_array($to)) {

--- a/vendor/api/php_utils/src/Strategy/ShareWorker.php
+++ b/vendor/api/php_utils/src/Strategy/ShareWorker.php
+<?php
+
+namespace Api\PhpUtils\Strategy;
+
+/**
+ * Class ShareWorker
+ * @package Api\PhpUtils\Strategy
+ *
+ * 优惠券分摊处理算法
+ */
+class ShareWorker {
+
+    /**
+     * @param $items = ['sku_1'=>100, 'sku_2'=>85]
+     * @param $tip = 100
+     * @throws \ErrorException
+     * 根据商品价格等比做优惠金额的分摊, 做四舍五入。
+     */
+    public static function coupon($items, $total_tip) {
+
+        if(!is_array($items) || $total_tip <= 0) {
+            throw new \ErrorException('输入分摊条件失败，请确认', '3001');
+        }
+        $total = 0;
+        foreach ($items as $k=>$price) {
+            if(!is_int($price) || $price < 0) {
+                throw new \ErrorException('存在金额非法，请核对金额', '3002');
+            }
+            $total += $price;
+        }
+
+        $ret = [];
+
+        $cleared = $cleared_tip = 0;
+        foreach ($items as $k=>$price) {
+            $left = $total - $cleared;
+            $ret[$k] = intval(round($price/$left * ($total_tip - $cleared_tip)));
+
+            $cleared_tip += $ret[$k];
+            $cleared += $price;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * @param $mutiArr = [
+                            ['goods'=>['a1'=>600, 'a2'=>100, 'a3'=>1300], 'tip'=>100],
+                            ['goods'=>['a1'=>600, 'a2'=>600, 'a3'=>600], 'tip'=>4],
+                        ];
+     * @return array = [
+                            ['a1' => 30, 'a2' => 5, 'a3' => 65],
+                            ['a1' => 1, 'a2' => 2, 'a3' => 1]
+                        ];
+     * @throws \ErrorException
+     * 批量计算奖励，
+     */
+    public static function batchCoupon($mutiArr) {
+
+        $ret = [];
+        foreach ($mutiArr as $k=>$item) {
+            $ret[$k] = self::coupon($item['goods'], $item['tip']);
+        }
+        return $ret;
+    }
+}
--- a/vendor/composer/InstalledVersions.php
+++ b/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' => '5cd0f2ace54fdc6b7e0a0d389e3e8030559220fd',
+    'reference' => 'ec360a59edfff2b202d7dd90a61cbfff5075f554',
    'name' => 'yidian/yaf_demo',
  ),
  'versions' => 
@@ -48,12 +48,12 @@ private static $installed = array (
    ),
    'api/php_utils' => 
    array (
-      'pretty_version' => 'v1.0.2',
-      'version' => '1.0.2.0',
+      'pretty_version' => 'v1.0.6',
+      'version' => '1.0.6.0',
      'aliases' => 
      array (
      ),
-      'reference' => '98d1aea6e76f55b2bfdd38c897fc6a8faa2bc722',
+      'reference' => '8e8e414961ea10f32b79dbaeeb60d9e441a97ad6',
    ),
    'bacon/bacon-qr-code' => 
    array (
@@ -236,7 +236,7 @@ private static $installed = array (
      'aliases' => 
      array (
      ),
-      'reference' => 'a603e5701bd6e305cfc777a8b50bf081ef73105e',
+      'reference' => '4b78e55b179003a42523a362cc0e8327f7a69b5e',
    ),
    'symfony/polyfill-ctype' => 
    array (
@@ -305,7 +305,7 @@ private static $installed = array (
      'aliases' => 
      array (
      ),
-      'reference' => '12e1e517a315fa3a108dfcd3674e31542055d133',
+      'reference' => 'd6ef552ac9b41f96e94e1e81d3a8746dfee3b34b',
    ),
    'symfony/property-info' => 
    array (
@@ -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' => '5cd0f2ace54fdc6b7e0a0d389e3e8030559220fd',
+      'reference' => 'ec360a59edfff2b202d7dd90a61cbfff5075f554',
    ),
  ),
 );

--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -77,6 +77,7 @@ return array(
    'Api\\PhpUtils\\Protobuf\\WebsiteLog\\WebLog' => $vendorDir . '/api/php_utils/src/Protobuf/WebsiteLog/WebLog.php',
    'Api\\PhpUtils\\RabbitMq\\DelayRabbitMq' => $vendorDir . '/api/php_utils/src/RabbitMq/DelayRabbitMq.php',
    'Api\\PhpUtils\\Redis\\RedisUtil' => $vendorDir . '/api/php_utils/src/Redis/RedisUtil.php',
+    'Api\\PhpUtils\\Strategy\\ShareWorker' => $vendorDir . '/api/php_utils/src/Strategy/ShareWorker.php',
    'Api\\PhpUtils\\Validate\\Validate' => $vendorDir . '/api/php_utils/src/Validate/Validate.php',
    'Api\\PhpUtils\\Validate\\ValidateRule' => $vendorDir . '/api/php_utils/src/Validate/ValidateRule.php',
    'App\\Base\\Base' => $baseDir . '/application/modules/Base/Base.php',
@@ -97,6 +98,7 @@ return array(
    'App\\Exception\\custom\\ShopException' => $baseDir . '/application/exception/custom/ShopException.php',
    'App\\Exception\\custom\\SignException' => $baseDir . '/application/exception/custom/SignException.php',
    'App\\Exception\\custom\\TestException' => $baseDir . '/application/exception/custom/TestException.php',
+    'App\\Exception\\custom\\UserException' => $baseDir . '/application/exception/custom/UserException.php',
    'App\\Models\\demo\\mongo\\Test' => $baseDir . '/application/models/demo/mongo/Test.php',
    'App\\Models\\demo\\mongo\\User' => $baseDir . '/application/models/demo/mongo/User.php',
    'App\\Models\\demo\\mysql\\User' => $baseDir . '/application/models/demo/mysql/User.php',
@@ -109,17 +111,24 @@ return array(
    'App\\Models\\goods\\mysql\\GoodsSpu' => $baseDir . '/application/models/goods/mysql/GoodsSpu.php',
    'App\\Models\\goods\\mysql\\InventoryOperationRecord' => $baseDir . '/application/models/goods/mysql/InventoryOperationRecord.php',
    'App\\Models\\goods\\mysql\\LifeAccountShopNum' => $baseDir . '/application/models/goods/mysql/LifeAccountShopNum.php',
+    'App\\Models\\goods\\mysql\\Ota' => $baseDir . '/application/models/goods/mysql/Ota.php',
    'App\\Models\\goods\\mysql\\PaySuccessGoodsCallbackRecord' => $baseDir . '/application/models/goods/mysql/PaySuccessGoodsCallbackRecord.php',
+    'App\\Models\\goods\\mysql\\PindanGoodsSku' => $baseDir . '/application/models/goods/mysql/PindanGoodsSku.php',
+    'App\\Models\\goods\\mysql\\PindanGoodsSnapshot' => $baseDir . '/application/models/goods/mysql/PindanGoodsSnapshot.php',
    'App\\Models\\goods\\mysql\\Shop' => $baseDir . '/application/models/goods/mysql/Shop.php',
    'App\\Models\\goods\\mysql\\Tcc' => $baseDir . '/application/models/goods/mysql/Tcc.php',
    'App\\Models\\marketing\\mysql\\Distributor' => $baseDir . '/application/models/marketing/mysql/Distributor.php',
    'App\\Models\\marketing\\mysql\\DistributorAuditRecord' => $baseDir . '/application/models/marketing/mysql/DistributorAuditRecord.php',
    'App\\Models\\marketing\\mysql\\Marketing' => $baseDir . '/application/models/marketing/mysql/Marketing.php',
    'App\\Models\\marketing\\mysql\\MarketingGoods' => $baseDir . '/application/models/marketing/mysql/MarketingGoods.php',
+    'App\\Models\\marketing\\mysql\\MarketingPindan' => $baseDir . '/application/models/marketing/mysql/MarketingPindan.php',
+    'App\\Models\\marketing\\mysql\\MarketingTakePlace' => $baseDir . '/application/models/marketing/mysql/MarketingTakePlace.php',
    'App\\Models\\marketing\\mysql\\QyqGroupleader' => $baseDir . '/application/models/marketing/mysql/QyqGroupleader.php',
+    'App\\Models\\marketing\\mysql\\TakePlace' => $baseDir . '/application/models/marketing/mysql/TakePlace.php',
    'App\\Models\\shop\\mysql\\Shop' => $baseDir . '/application/models/shop/mysql/Shop.php',
    'App\\Models\\shop\\mysql\\SubShop' => $baseDir . '/application/models/shop/mysql/SubShop.php',
    'App\\Models\\tmp\\mysql\\QyqTicketData' => $baseDir . '/application/models/tmp/mysql/QyqTicketData.php',
+    'App\\Models\\user\\mysql\\UserWechatBind' => $baseDir . '/application/models/user/mysql/UserWechatBind.php',
    'App\\Plugins\\Hook' => $baseDir . '/application/plugins/Hook.php',
    'App\\Services\\common\\CommonService' => $baseDir . '/application/services/common/CommonService.php',
    'App\\Services\\demo\\ElasticService' => $baseDir . '/application/services/demo/ElasticService.php',
@@ -128,13 +137,19 @@ return array(
    'App\\Services\\goods\\CategoryService' => $baseDir . '/application/services/goods/CategoryService.php',
    'App\\Services\\goods\\ElasticGoodService' => $baseDir . '/application/services/goods/ElasticGoodService.php',
    'App\\Services\\goods\\GoodsService' => $baseDir . '/application/services/goods/GoodsService.php',
+    'App\\Services\\goods\\MarketingPindanGoodsService' => $baseDir . '/application/services/goods/MarketingPindanGoodsService.php',
+    'App\\Services\\goods\\OtaService' => $baseDir . '/application/services/goods/OtaService.php',
    'App\\Services\\marketing\\DistributionService' => $baseDir . '/application/services/marketing/DistributionService.php',
    'App\\Services\\marketing\\DistributorService' => $baseDir . '/application/services/marketing/DistributorService.php',
    'App\\Services\\marketing\\MarketingGoodsService' => $baseDir . '/application/services/marketing/MarketingGoodsService.php',
    'App\\Services\\marketing\\MarketingService' => $baseDir . '/application/services/marketing/MarketingService.php',
+    'App\\Services\\marketing\\TakePlaceService' => $baseDir . '/application/services/marketing/TakePlaceService.php',
    'App\\Services\\shop\\ShopService' => $baseDir . '/application/services/shop/ShopService.php',
    'App\\Services\\tcc\\Tcc2Service' => $baseDir . '/application/services/tcc/Tcc2Service.php',
    'App\\Services\\tcc\\TccService' => $baseDir . '/application/services/tcc/TccService.php',
+    'App\\Services\\user\\UserService' => $baseDir . '/application/services/user/UserService.php',
+    'App\\Services\\user\\Weixin\\ErrorCode' => $baseDir . '/application/services/user/Weixin/ErrorCode.php',
+    'App\\Services\\user\\Weixin\\WxBizDataCrypt' => $baseDir . '/application/services/user/Weixin/WxBizDataCrypt.php',
    'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
    'BaconQrCode\\Common\\BitArray' => $vendorDir . '/bacon/bacon-qr-code/src/Common/BitArray.php',
    'BaconQrCode\\Common\\BitMatrix' => $vendorDir . '/bacon/bacon-qr-code/src/Common/BitMatrix.php',
@@ -209,6 +224,7 @@ return array(
    'DASPRiD\\Enum\\NullValue' => $vendorDir . '/dasprid/enum/src/NullValue.php',
    'Daemon\\Goods' => $baseDir . '/daemon/Goods.php',
    'Daemon\\Marketing' => $baseDir . '/daemon/Marketing.php',
+    'Daemon\\Pindan' => $baseDir . '/daemon/Pindan.php',
    'Daemon\\Test' => $baseDir . '/daemon/Test.php',
    'Elasticsearch\\Client' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
    'Elasticsearch\\ClientBuilder' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',

--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -306,6 +306,7 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
        'Api\\PhpUtils\\Protobuf\\WebsiteLog\\WebLog' => __DIR__ . '/..' . '/api/php_utils/src/Protobuf/WebsiteLog/WebLog.php',
        'Api\\PhpUtils\\RabbitMq\\DelayRabbitMq' => __DIR__ . '/..' . '/api/php_utils/src/RabbitMq/DelayRabbitMq.php',
        'Api\\PhpUtils\\Redis\\RedisUtil' => __DIR__ . '/..' . '/api/php_utils/src/Redis/RedisUtil.php',
+        'Api\\PhpUtils\\Strategy\\ShareWorker' => __DIR__ . '/..' . '/api/php_utils/src/Strategy/ShareWorker.php',
        'Api\\PhpUtils\\Validate\\Validate' => __DIR__ . '/..' . '/api/php_utils/src/Validate/Validate.php',
        'Api\\PhpUtils\\Validate\\ValidateRule' => __DIR__ . '/..' . '/api/php_utils/src/Validate/ValidateRule.php',
        'App\\Base\\Base' => __DIR__ . '/../..' . '/application/modules/Base/Base.php',
@@ -326,6 +327,7 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
        'App\\Exception\\custom\\ShopException' => __DIR__ . '/../..' . '/application/exception/custom/ShopException.php',
        'App\\Exception\\custom\\SignException' => __DIR__ . '/../..' . '/application/exception/custom/SignException.php',
        'App\\Exception\\custom\\TestException' => __DIR__ . '/../..' . '/application/exception/custom/TestException.php',
+        'App\\Exception\\custom\\UserException' => __DIR__ . '/../..' . '/application/exception/custom/UserException.php',
        'App\\Models\\demo\\mongo\\Test' => __DIR__ . '/../..' . '/application/models/demo/mongo/Test.php',
        'App\\Models\\demo\\mongo\\User' => __DIR__ . '/../..' . '/application/models/demo/mongo/User.php',
        'App\\Models\\demo\\mysql\\User' => __DIR__ . '/../..' . '/application/models/demo/mysql/User.php',
@@ -338,17 +340,24 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
        'App\\Models\\goods\\mysql\\GoodsSpu' => __DIR__ . '/../..' . '/application/models/goods/mysql/GoodsSpu.php',
        'App\\Models\\goods\\mysql\\InventoryOperationRecord' => __DIR__ . '/../..' . '/application/models/goods/mysql/InventoryOperationRecord.php',
        'App\\Models\\goods\\mysql\\LifeAccountShopNum' => __DIR__ . '/../..' . '/application/models/goods/mysql/LifeAccountShopNum.php',
+        'App\\Models\\goods\\mysql\\Ota' => __DIR__ . '/../..' . '/application/models/goods/mysql/Ota.php',
        'App\\Models\\goods\\mysql\\PaySuccessGoodsCallbackRecord' => __DIR__ . '/../..' . '/application/models/goods/mysql/PaySuccessGoodsCallbackRecord.php',
+        'App\\Models\\goods\\mysql\\PindanGoodsSku' => __DIR__ . '/../..' . '/application/models/goods/mysql/PindanGoodsSku.php',
+        'App\\Models\\goods\\mysql\\PindanGoodsSnapshot' => __DIR__ . '/../..' . '/application/models/goods/mysql/PindanGoodsSnapshot.php',
        'App\\Models\\goods\\mysql\\Shop' => __DIR__ . '/../..' . '/application/models/goods/mysql/Shop.php',
        'App\\Models\\goods\\mysql\\Tcc' => __DIR__ . '/../..' . '/application/models/goods/mysql/Tcc.php',
        'App\\Models\\marketing\\mysql\\Distributor' => __DIR__ . '/../..' . '/application/models/marketing/mysql/Distributor.php',
        'App\\Models\\marketing\\mysql\\DistributorAuditRecord' => __DIR__ . '/../..' . '/application/models/marketing/mysql/DistributorAuditRecord.php',
        'App\\Models\\marketing\\mysql\\Marketing' => __DIR__ . '/../..' . '/application/models/marketing/mysql/Marketing.php',
        'App\\Models\\marketing\\mysql\\MarketingGoods' => __DIR__ . '/../..' . '/application/models/marketing/mysql/MarketingGoods.php',
+        'App\\Models\\marketing\\mysql\\MarketingPindan' => __DIR__ . '/../..' . '/application/models/marketing/mysql/MarketingPindan.php',
+        'App\\Models\\marketing\\mysql\\MarketingTakePlace' => __DIR__ . '/../..' . '/application/models/marketing/mysql/MarketingTakePlace.php',
        'App\\Models\\marketing\\mysql\\QyqGroupleader' => __DIR__ . '/../..' . '/application/models/marketing/mysql/QyqGroupleader.php',
+        'App\\Models\\marketing\\mysql\\TakePlace' => __DIR__ . '/../..' . '/application/models/marketing/mysql/TakePlace.php',
        'App\\Models\\shop\\mysql\\Shop' => __DIR__ . '/../..' . '/application/models/shop/mysql/Shop.php',
        'App\\Models\\shop\\mysql\\SubShop' => __DIR__ . '/../..' . '/application/models/shop/mysql/SubShop.php',
        'App\\Models\\tmp\\mysql\\QyqTicketData' => __DIR__ . '/../..' . '/application/models/tmp/mysql/QyqTicketData.php',
+        'App\\Models\\user\\mysql\\UserWechatBind' => __DIR__ . '/../..' . '/application/models/user/mysql/UserWechatBind.php',
        'App\\Plugins\\Hook' => __DIR__ . '/../..' . '/application/plugins/Hook.php',
        'App\\Services\\common\\CommonService' => __DIR__ . '/../..' . '/application/services/common/CommonService.php',
        'App\\Services\\demo\\ElasticService' => __DIR__ . '/../..' . '/application/services/demo/ElasticService.php',
@@ -357,13 +366,19 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
        'App\\Services\\goods\\CategoryService' => __DIR__ . '/../..' . '/application/services/goods/CategoryService.php',
        'App\\Services\\goods\\ElasticGoodService' => __DIR__ . '/../..' . '/application/services/goods/ElasticGoodService.php',
        'App\\Services\\goods\\GoodsService' => __DIR__ . '/../..' . '/application/services/goods/GoodsService.php',
+        'App\\Services\\goods\\MarketingPindanGoodsService' => __DIR__ . '/../..' . '/application/services/goods/MarketingPindanGoodsService.php',
+        'App\\Services\\goods\\OtaService' => __DIR__ . '/../..' . '/application/services/goods/OtaService.php',
        'App\\Services\\marketing\\DistributionService' => __DIR__ . '/../..' . '/application/services/marketing/DistributionService.php',
        'App\\Services\\marketing\\DistributorService' => __DIR__ . '/../..' . '/application/services/marketing/DistributorService.php',
        'App\\Services\\marketing\\MarketingGoodsService' => __DIR__ . '/../..' . '/application/services/marketing/MarketingGoodsService.php',
        'App\\Services\\marketing\\MarketingService' => __DIR__ . '/../..' . '/application/services/marketing/MarketingService.php',
+        'App\\Services\\marketing\\TakePlaceService' => __DIR__ . '/../..' . '/application/services/marketing/TakePlaceService.php',
        'App\\Services\\shop\\ShopService' => __DIR__ . '/../..' . '/application/services/shop/ShopService.php',
        'App\\Services\\tcc\\Tcc2Service' => __DIR__ . '/../..' . '/application/services/tcc/Tcc2Service.php',
        'App\\Services\\tcc\\TccService' => __DIR__ . '/../..' . '/application/services/tcc/TccService.php',
+        'App\\Services\\user\\UserService' => __DIR__ . '/../..' . '/application/services/user/UserService.php',
+        'App\\Services\\user\\Weixin\\ErrorCode' => __DIR__ . '/../..' . '/application/services/user/Weixin/ErrorCode.php',
+        'App\\Services\\user\\Weixin\\WxBizDataCrypt' => __DIR__ . '/../..' . '/application/services/user/Weixin/WxBizDataCrypt.php',
        'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
        'BaconQrCode\\Common\\BitArray' => __DIR__ . '/..' . '/bacon/bacon-qr-code/src/Common/BitArray.php',
        'BaconQrCode\\Common\\BitMatrix' => __DIR__ . '/..' . '/bacon/bacon-qr-code/src/Common/BitMatrix.php',
@@ -438,6 +453,7 @@ class ComposerStaticInit5871a7b0b10b793d91ef1c8029b23ea5
        'DASPRiD\\Enum\\NullValue' => __DIR__ . '/..' . '/dasprid/enum/src/NullValue.php',
        'Daemon\\Goods' => __DIR__ . '/../..' . '/daemon/Goods.php',
        'Daemon\\Marketing' => __DIR__ . '/../..' . '/daemon/Marketing.php',
+        'Daemon\\Pindan' => __DIR__ . '/../..' . '/daemon/Pindan.php',
        'Daemon\\Test' => __DIR__ . '/../..' . '/daemon/Test.php',
        'Elasticsearch\\Client' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
        'Elasticsearch\\ClientBuilder' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',

--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -27,12 +27,12 @@
        },
        {
            "name": "api/php_utils",
-            "version": "v1.0.2",
-            "version_normalized": "1.0.2.0",
+            "version": "v1.0.6",
+            "version_normalized": "1.0.6.0",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "98d1aea6e76f55b2bfdd38c897fc6a8faa2bc722"
+                "reference": "8e8e414961ea10f32b79dbaeeb60d9e441a97ad6"
            },
            "require": {
                "elasticsearch/elasticsearch": "~7.0",
@@ -44,7 +44,7 @@
                "mongodb/mongodb": "1.4.3",
                "php": "7.2.*"
            },
-            "time": "2021-08-03T02:31:09+00:00",
+            "time": "2021-08-06T16:38:16+00:00",
            "type": "library",
            "installation-source": "source",
            "autoload": {
@@ -1186,12 +1186,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e"
+                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a603e5701bd6e305cfc777a8b50bf081ef73105e",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4b78e55b179003a42523a362cc0e8327f7a69b5e",
+                "reference": "4b78e55b179003a42523a362cc0e8327f7a69b5e",
                "shasum": ""
            },
            "require": {
@@ -1200,7 +1200,7 @@
                "symfony/polyfill-php73": "~1.0",
                "symfony/polyfill-php80": "^1.16"
            },
-            "time": "2021-07-23T15:55:36+00:00",
+            "time": "2021-08-04T21:20:46+00:00",
            "type": "library",
            "installation-source": "dist",
            "autoload": {
@@ -1233,7 +1233,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/5.4"
+                "source": "https://github.com/symfony/options-resolver/tree/5.3"
            },
            "funding": [
                {
@@ -1768,12 +1768,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/property-access.git",
-                "reference": "12e1e517a315fa3a108dfcd3674e31542055d133"
+                "reference": "d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/12e1e517a315fa3a108dfcd3674e31542055d133",
-                "reference": "12e1e517a315fa3a108dfcd3674e31542055d133",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b",
+                "reference": "d6ef552ac9b41f96e94e1e81d3a8746dfee3b34b",
                "shasum": ""
            },
            "require": {
@@ -1788,7 +1788,7 @@
            "suggest": {
                "psr/cache-implementation": "To cache access methods."
            },
-            "time": "2021-07-21T12:43:48+00:00",
+            "time": "2021-08-04T21:21:08+00:00",
            "type": "library",
            "installation-source": "dist",
            "autoload": {

--- a/vendor/composer/installed.php
+++ b/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' => '5cd0f2ace54fdc6b7e0a0d389e3e8030559220fd',
+    'reference' => 'ec360a59edfff2b202d7dd90a61cbfff5075f554',
    'name' => 'yidian/yaf_demo',
  ),
  'versions' => 
@@ -22,12 +22,12 @@
    ),
    'api/php_utils' => 
    array (
-      'pretty_version' => 'v1.0.2',
-      'version' => '1.0.2.0',
+      'pretty_version' => 'v1.0.6',
+      'version' => '1.0.6.0',
      'aliases' => 
      array (
      ),
-      'reference' => '98d1aea6e76f55b2bfdd38c897fc6a8faa2bc722',
+      'reference' => '8e8e414961ea10f32b79dbaeeb60d9e441a97ad6',
    ),
    'bacon/bacon-qr-code' => 
    array (
@@ -210,7 +210,7 @@
      'aliases' => 
      array (
      ),
-      'reference' => 'a603e5701bd6e305cfc777a8b50bf081ef73105e',
+      'reference' => '4b78e55b179003a42523a362cc0e8327f7a69b5e',
    ),
    'symfony/polyfill-ctype' => 
    array (
@@ -279,7 +279,7 @@
      'aliases' => 
      array (
      ),
-      'reference' => '12e1e517a315fa3a108dfcd3674e31542055d133',
+      'reference' => 'd6ef552ac9b41f96e94e1e81d3a8746dfee3b34b',
    ),
    'symfony/property-info' => 
    array (
@@ -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' => '5cd0f2ace54fdc6b7e0a0d389e3e8030559220fd',
+      'reference' => 'ec360a59edfff2b202d7dd90a61cbfff5075f554',
    ),
  ),
 );
--- a/vendor/symfony/options-resolver/OptionsResolver.php
+++ b/vendor/symfony/options-resolver/OptionsResolver.php
@@ -942,6 +942,7 @@ class OptionsResolver implements Options
     * @throws OptionDefinitionException If there is a cyclic dependency between
     *                                   lazy options and/or normalizers
     */
+    #[\ReturnTypeWillChange]
    public function offsetGet($option, bool $triggerDeprecation = true)
    {
        if (!$this->locked) {
@@ -1199,6 +1200,7 @@ class OptionsResolver implements Options
     *
     * @see \ArrayAccess::offsetExists()
     */
+    #[\ReturnTypeWillChange]
    public function offsetExists($option)
    {
        if (!$this->locked) {
@@ -1215,6 +1217,7 @@ class OptionsResolver implements Options
     *
     * @throws AccessException
     */
+    #[\ReturnTypeWillChange]
    public function offsetSet($option, $value)
    {
        throw new AccessException('Setting options via array access is not supported. Use setDefault() instead.');
@@ -1227,6 +1230,7 @@ class OptionsResolver implements Options
     *
     * @throws AccessException
     */
+    #[\ReturnTypeWillChange]
    public function offsetUnset($option)
    {
        throw new AccessException('Removing options via array access is not supported. Use remove() instead.');
@@ -1243,6 +1247,7 @@ class OptionsResolver implements Options
     *
     * @see \Countable::count()
     */
+    #[\ReturnTypeWillChange]
    public function count()
    {
        if (!$this->locked) {

--- a/vendor/symfony/property-access/PropertyPath.php
+++ b/vendor/symfony/property-access/PropertyPath.php
@@ -154,6 +154,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
     *
     * @return PropertyPathIteratorInterface
     */
+    #[\ReturnTypeWillChange]
    public function getIterator()
    {
        return new PropertyPathIterator($this);