From 1dfcc5660f136e21921c7c9d4e61b8a292a795ca Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 16 May 2023 09:39:27 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9im=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/MessageIm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Model/MessageIm.php b/app/Model/MessageIm.php index 9c24d68..14d1275 100644 --- a/app/Model/MessageIm.php +++ b/app/Model/MessageIm.php @@ -11,7 +11,7 @@ use Hyperf\Snowflake\Concern\Snowflake; /** * @property int $message_id 主键id - * @property int $from_user_id 发送方user_id + * @property string $from_user_id 发送方user_id * @property int $to_user_id 接收方user_id * @property string $message_key 消息唯一标识（系统返回，撤回消息使用） * @property string $message_send_time 消息发送时间戳 From e18fd8df227631b9c5ea809617b0b38cf3762505 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 16 May 2023 14:53:40 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/OrderInquiry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Model/OrderInquiry.php b/app/Model/OrderInquiry.php index b18251e..172accf 100644 --- a/app/Model/OrderInquiry.php +++ b/app/Model/OrderInquiry.php @@ -186,8 +186,8 @@ class OrderInquiry extends Model public static function getDoctorCreatedDateOrderInquiryPage(array $params, array $reception_time, array $fields = ["*"], int $page = null, ?int $per_page = 10): mixed { $raw = self::where($params) - ->whereBetween('finish_time', $reception_time) - ->orderBy('finish_time') + ->whereBetween('created_at', $reception_time) + ->orderBy('created_at') ->paginate($per_page, $fields, "page", $page); $data = array(); From 9f8dd7c17c96ab81a4ebf9193141af1ffda09f44 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 28 Jul 2023 18:24:47 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9lock=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 263 +++++++++++++++++++++++++------------------------- 1 file changed, 133 insertions(+), 130 deletions(-) diff --git a/composer.lock b/composer.lock index 9794d00..91a63b4 100644 --- a/composer.lock +++ b/composer.lock @@ -1367,8 +1367,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/async-queue/v3.0.18", - "reference": "075b9a68e927f92586e6fecd627aa81987b15ab8", - "shasum": "075b9a68e927f92586e6fecd627aa81987b15ab8" + "reference": "d8fd56d9643a2f8f7406cc05306531aec4b95de0", + "shasum": "d8fd56d9643a2f8f7406cc05306531aec4b95de0" }, "require": { "hyperf/codec": "~3.0.0", @@ -1424,12 +1424,12 @@ }, { "name": "hyperf/cache", - "version": "v3.0.18", + "version": "v3.0.26", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/cache/v3.0.18", - "reference": "2fea543251e0534966b46da801d5cd1e44634234", - "shasum": "2fea543251e0534966b46da801d5cd1e44634234" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/cache/v3.0.26", + "reference": "db83b8a49202aa391a8bc23b7bfd450a27283061", + "shasum": "db83b8a49202aa391a8bc23b7bfd450a27283061" }, "require": { "hyperf/codec": "~3.0.0", @@ -1486,8 +1486,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/code-parser/v3.0.18", - "reference": "5998a7e6e2a524f9455f72d371e354ea9de7aea1", - "shasum": "5998a7e6e2a524f9455f72d371e354ea9de7aea1" + "reference": "09cf5238ff84284c3200d7faff552adfc14a6ebf", + "shasum": "09cf5238ff84284c3200d7faff552adfc14a6ebf" }, "require": { "hyperf/collection": "~3.0.0", @@ -1534,12 +1534,12 @@ }, { "name": "hyperf/codec", - "version": "v3.0.1", + "version": "v3.0.30", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/codec/v3.0.1", - "reference": "cf8faab62e202497f7b0617b9da94989928f03a6", - "shasum": "cf8faab62e202497f7b0617b9da94989928f03a6" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/codec/v3.0.30", + "reference": "b9424b52cfca296fc819d785fff30c7eea36cd3b", + "shasum": "b9424b52cfca296fc819d785fff30c7eea36cd3b" }, "require": { "ext-json": "*", @@ -1547,6 +1547,9 @@ "hyperf/contract": "~3.0.0", "php": ">=8.0" }, + "suggest": { + "ext-igbinary": "Required to use IgbinarySerializerPacker." + }, "type": "library", "extra": { "branch-alias": { @@ -1582,12 +1585,12 @@ }, { "name": "hyperf/collection", - "version": "v3.0.21", + "version": "v3.0.29", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/collection/v3.0.21", - "reference": "68c966f9abdb1e8f45d7f2da4d51c98adca0bf40", - "shasum": "68c966f9abdb1e8f45d7f2da4d51c98adca0bf40" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/collection/v3.0.29", + "reference": "455aa584f4b5277c46b4c2a3e76b03417054a3e6", + "shasum": "455aa584f4b5277c46b4c2a3e76b03417054a3e6" }, "require": { "hyperf/contract": "~3.0.0", @@ -1632,12 +1635,12 @@ }, { "name": "hyperf/command", - "version": "v3.0.23", + "version": "v3.0.27", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/command/v3.0.23", - "reference": "6d2f6f1c47a6fcde4942c55b3187af553d26ef34", - "shasum": "6d2f6f1c47a6fcde4942c55b3187af553d26ef34" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/command/v3.0.27", + "reference": "73d3160c752913676d8ada632d498ec423fe425b", + "shasum": "73d3160c752913676d8ada632d498ec423fe425b" }, "require": { "hyperf/support": "~3.0.0", @@ -1682,8 +1685,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/conditionable/v3.0.0", - "reference": "ccf122831ec2de36ca5ebb9bd4af4250dcc23faf", - "shasum": "ccf122831ec2de36ca5ebb9bd4af4250dcc23faf" + "reference": "acf1854ba2beadaa7a2248e46f44841bf4e57c67", + "shasum": "acf1854ba2beadaa7a2248e46f44841bf4e57c67" }, "require": { "php": ">=7.4" @@ -1727,8 +1730,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/config/v3.0.20", - "reference": "ef3b89a6a18de66ad53fafab56ad8e6672eab992", - "shasum": "ef3b89a6a18de66ad53fafab56ad8e6672eab992" + "reference": "44d1e4636661f0572512a94169fd2a2bfbbc8b2d", + "shasum": "44d1e4636661f0572512a94169fd2a2bfbbc8b2d" }, "require": { "hyperf/collection": "~3.0.0", @@ -1791,8 +1794,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/constants/v3.0.18", - "reference": "8c0ed1b3dfa609a860c6d2d5fcd0eb1c0b8721e2", - "shasum": "8c0ed1b3dfa609a860c6d2d5fcd0eb1c0b8721e2" + "reference": "714b07a448671f5c09b907a8d3bcd570bb1396a9", + "shasum": "714b07a448671f5c09b907a8d3bcd570bb1396a9" }, "require": { "hyperf/di": "~3.0.0", @@ -1844,8 +1847,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/context/v3.0.18", - "reference": "a0cc2890dcca459103077f5d87ba2717765adff7", - "shasum": "a0cc2890dcca459103077f5d87ba2717765adff7" + "reference": "79de6266d5c0603d545362a0657856e13e357a46", + "shasum": "79de6266d5c0603d545362a0657856e13e357a46" }, "require": { "hyperf/engine": "^1.2|^2.0", @@ -1890,8 +1893,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/contract/v3.0.10", - "reference": "38be2f4fbfaea03cb50a0bab6d67f2d2067bf95a", - "shasum": "38be2f4fbfaea03cb50a0bab6d67f2d2067bf95a" + "reference": "6f5eb5e3d979e1fabbc7e1bd7e80c98121a5d14a", + "shasum": "6f5eb5e3d979e1fabbc7e1bd7e80c98121a5d14a" }, "require": { "php": ">=8.0" @@ -1929,8 +1932,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/coordinator/v3.0.22", - "reference": "f049e6b73a90f056201aa9805c06693b5e35de7b", - "shasum": "f049e6b73a90f056201aa9805c06693b5e35de7b" + "reference": "614412a4502ad06b31f628711444bd56f1e3ee22", + "shasum": "614412a4502ad06b31f628711444bd56f1e3ee22" }, "require": { "hyperf/engine": "^1.2|^2.0", @@ -1975,8 +1978,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/coroutine/v3.0.16", - "reference": "06b3b38fc2e8095b37a4feabbcf345907069c40a", - "shasum": "06b3b38fc2e8095b37a4feabbcf345907069c40a" + "reference": "7f1d81bba50f1af8f6b909b771c3e9269619fa29", + "shasum": "7f1d81bba50f1af8f6b909b771c3e9269619fa29" }, "require": { "hyperf/context": "~3.0.0", @@ -2073,18 +2076,18 @@ }, { "name": "hyperf/database", - "version": "v3.0.23", + "version": "v3.0.30", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/database/v3.0.23", - "reference": "6aa54f1716838ea676527c0994131765ace1615c", - "shasum": "6aa54f1716838ea676527c0994131765ace1615c" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/database/v3.0.30", + "reference": "0d56e81769593fa693de44ab80ac9882eb905b38", + "shasum": "0d56e81769593fa693de44ab80ac9882eb905b38" }, "require": { "hyperf/code-parser": "~3.0.0", "hyperf/collection": "~3.0.0", "hyperf/macroable": "~3.0.0", - "hyperf/support": "~3.0.0", + "hyperf/support": "~3.0.24", "hyperf/tappable": "~3.0.0", "hyperf/utils": "~3.0.0", "nesbot/carbon": "^2.0", @@ -2187,12 +2190,12 @@ }, { "name": "hyperf/di", - "version": "v3.0.18", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/di/v3.0.18", - "reference": "66d5e92683cfaa9927cb22b8716c3f419c5d27c5", - "shasum": "66d5e92683cfaa9927cb22b8716c3f419c5d27c5" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/di/v3.0.24", + "reference": "53969f159a586b7256927fab837f0675db777a3e", + "shasum": "53969f159a586b7256927fab837f0675db777a3e" }, "require": { "doctrine/instantiator": "^1.0", @@ -2249,18 +2252,18 @@ }, { "name": "hyperf/dispatcher", - "version": "v3.0.16", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/dispatcher/v3.0.16", - "reference": "84352950c76ff1ef0307dd39758abaaf47baa5f6", - "shasum": "84352950c76ff1ef0307dd39758abaaf47baa5f6" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/dispatcher/v3.0.24", + "reference": "eca5620db1a71a5b9b485ae22a5fcd2f62260258", + "shasum": "eca5620db1a71a5b9b485ae22a5fcd2f62260258" }, "require": { "hyperf/contract": "~3.0.0", "php": ">=8.0", "psr/container": "^1.0|^2.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0|^2.0", "psr/http-server-middleware": "^1.0" }, "type": "library", @@ -2358,8 +2361,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/event/v3.0.0", - "reference": "408040612e36cd93ae9c362ce29e6962c42c3fa1", - "shasum": "408040612e36cd93ae9c362ce29e6962c42c3fa1" + "reference": "687743ca1f3643276f19bd232180221814431ee1", + "shasum": "687743ca1f3643276f19bd232180221814431ee1" }, "require": { "hyperf/contract": "~3.0.0", @@ -2407,12 +2410,12 @@ }, { "name": "hyperf/exception-handler", - "version": "v3.0.18", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/exception-handler/v3.0.18", - "reference": "af8fb12072a02bc27d68f2c60eaded462ed04f37", - "shasum": "af8fb12072a02bc27d68f2c60eaded462ed04f37" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/exception-handler/v3.0.24", + "reference": "6c024d3021cf0c115c3ac80eb8c92e365cb1c2c7", + "shasum": "6c024d3021cf0c115c3ac80eb8c92e365cb1c2c7" }, "require": { "hyperf/contract": "~3.0.0", @@ -2421,7 +2424,7 @@ "hyperf/utils": "~3.0.0", "php": ">=8.0", "psr/container": "^1.0|^2.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0|^2.0" }, "type": "library", "extra": { @@ -2464,8 +2467,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/framework/v3.0.23", - "reference": "099520f283efa109b2f83f7a7b0bfddc2c1109ba", - "shasum": "099520f283efa109b2f83f7a7b0bfddc2c1109ba" + "reference": "990cc53e7230d165ef94d06faa31837b196e9dcd", + "shasum": "990cc53e7230d165ef94d06faa31837b196e9dcd" }, "require": { "fig/http-message-util": "^1.1.2", @@ -2524,18 +2527,18 @@ }, { "name": "hyperf/guzzle", - "version": "v3.0.18", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/guzzle/v3.0.18", - "reference": "aa0e36ce1d78cc402ea449def1409ed827e53381", - "shasum": "aa0e36ce1d78cc402ea449def1409ed827e53381" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/guzzle/v3.0.24", + "reference": "ede3ea8aca5fa88163ad706ba0e2234a4e9e73cd", + "shasum": "ede3ea8aca5fa88163ad706ba0e2234a4e9e73cd" }, "require": { "guzzlehttp/guzzle": "^6.3|^7.0", "php": ">=8.0", "psr/container": "^1.0|^2.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0|^2.0" }, "suggest": { "ext-curl": "Required for CURL handler support", @@ -2577,8 +2580,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/http-message/v3.0.18", - "reference": "f3798dee017f6008762aedac9013dff2d28adc83", - "shasum": "f3798dee017f6008762aedac9013dff2d28adc83" + "reference": "1fed954be30f9ff185360efe5f6f4b774e70194b", + "shasum": "1fed954be30f9ff185360efe5f6f4b774e70194b" }, "require": { "hyperf/codec": "~3.0.0", @@ -2624,12 +2627,12 @@ }, { "name": "hyperf/http-server", - "version": "v3.0.21", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/http-server/v3.0.21", - "reference": "7f774afe695e67be93928f5da53cf42d5f1e9280", - "shasum": "7f774afe695e67be93928f5da53cf42d5f1e9280" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/http-server/v3.0.24", + "reference": "23bf6fd698b22177dfe8a7595c6956becb04c9d9", + "shasum": "23bf6fd698b22177dfe8a7595c6956becb04c9d9" }, "require": { "hyperf/codec": "~3.0.0", @@ -2695,8 +2698,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/logger/v3.0.20", - "reference": "efcddc1c332416bca5066e8c5a7788124247ab6f", - "shasum": "efcddc1c332416bca5066e8c5a7788124247ab6f" + "reference": "b41374876dbf782bc330223b1b0c3df2c51337e4", + "shasum": "b41374876dbf782bc330223b1b0c3df2c51337e4" }, "require": { "hyperf/contract": "~3.0.0", @@ -2748,8 +2751,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/macroable/v3.0.0", - "reference": "d0f1abc8761af3c8a4884c04ff5234cc8524da20", - "shasum": "d0f1abc8761af3c8a4884c04ff5234cc8524da20" + "reference": "b76659a7708e3508b84a7cc8a0b99d4e0a6119e3", + "shasum": "b76659a7708e3508b84a7cc8a0b99d4e0a6119e3" }, "require": { "php": ">=7.4" @@ -2837,8 +2840,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/model-listener/v3.0.18", - "reference": "2d85b84b58c6f1492c47230f86f03323e574aa41", - "shasum": "2d85b84b58c6f1492c47230f86f03323e574aa41" + "reference": "15a7741288efc696f88abba7683e74a0413a41db", + "shasum": "15a7741288efc696f88abba7683e74a0413a41db" }, "require": { "hyperf/contract": "~3.0.0", @@ -2943,8 +2946,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/pipeline/v3.0.16", - "reference": "86393ceaed5d20a5585e82e4295839b201593bd3", - "shasum": "86393ceaed5d20a5585e82e4295839b201593bd3" + "reference": "351149a128c9be0e8388f5c77baab1464a391253", + "shasum": "351149a128c9be0e8388f5c77baab1464a391253" }, "require": { "php": ">=8.0", @@ -2989,8 +2992,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/pool/v3.0.18", - "reference": "5e2d307bc3bb2ac9a5b9acb669a58bb8f46627b6", - "shasum": "5e2d307bc3bb2ac9a5b9acb669a58bb8f46627b6" + "reference": "a51177e8c498d2231151593fcb95e92d168c5ebc", + "shasum": "a51177e8c498d2231151593fcb95e92d168c5ebc" }, "require": { "hyperf/contract": "~3.0.0", @@ -3041,8 +3044,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/process/v3.0.22", - "reference": "2d3d44e56c0f4a4b89a2b438f66fe7100f9bfaee", - "shasum": "2d3d44e56c0f4a4b89a2b438f66fe7100f9bfaee" + "reference": "06ea5fa5b3267eb2685715b7679b69f968e61986", + "shasum": "06ea5fa5b3267eb2685715b7679b69f968e61986" }, "require": { "hyperf/contract": "~3.0.0", @@ -3098,8 +3101,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/redis/v3.0.21", - "reference": "e024c702a0a172833d5fb76ba70cf934d0c450cb", - "shasum": "e024c702a0a172833d5fb76ba70cf934d0c450cb" + "reference": "21510bbfa31387643ae7ac138368b58b93e61cf6", + "shasum": "21510bbfa31387643ae7ac138368b58b93e61cf6" }, "require": { "ext-redis": "*", @@ -3157,8 +3160,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/serializer/v3.0.0", - "reference": "ba5813f2442362aced81765b5f76fadadc6df86c", - "shasum": "ba5813f2442362aced81765b5f76fadadc6df86c" + "reference": "ba7659a4f9928aa6f46c47649d1b9fa2fed379c8", + "shasum": "ba7659a4f9928aa6f46c47649d1b9fa2fed379c8" }, "require": { "hyperf/contract": "~3.0.0", @@ -3207,12 +3210,12 @@ }, { "name": "hyperf/server", - "version": "v3.0.20", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/server/v3.0.20", - "reference": "f66c6b9e8789666582a943f446ccf124f8b4f7b2", - "shasum": "f66c6b9e8789666582a943f446ccf124f8b4f7b2" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/server/v3.0.24", + "reference": "8129ef965778acb97b0977d751e9a7b17c85ba21", + "shasum": "8129ef965778acb97b0977d751e9a7b17c85ba21" }, "require": { "hyperf/contract": "~3.0.0", @@ -3316,12 +3319,12 @@ }, { "name": "hyperf/stringable", - "version": "v3.0.18", + "version": "v3.0.27", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/stringable/v3.0.18", - "reference": "b8dfc08254ec0385a7361f82720c8995091a3d83", - "shasum": "b8dfc08254ec0385a7361f82720c8995091a3d83" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/stringable/v3.0.27", + "reference": "17cf616de2698100364d0381861fc18fd64a3f07", + "shasum": "17cf616de2698100364d0381861fc18fd64a3f07" }, "require": { "hyperf/collection": "~3.0.0", @@ -3373,12 +3376,12 @@ }, { "name": "hyperf/support", - "version": "v3.0.1", + "version": "v3.0.24", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/support/v3.0.1", - "reference": "c0baef1766969c3deb18a52a6065555e6f44b721", - "shasum": "c0baef1766969c3deb18a52a6065555e6f44b721" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/support/v3.0.24", + "reference": "2f30401ef07803829376334b2afdaa05a17af358", + "shasum": "2f30401ef07803829376334b2afdaa05a17af358" }, "require": { "hyperf/collection": "~3.0.0", @@ -3434,8 +3437,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/tappable/v3.0.0", - "reference": "4953925063af0d335eede9b1357403e9a0ad9340", - "shasum": "4953925063af0d335eede9b1357403e9a0ad9340" + "reference": "5833fabfe5b6161265d9debce5be422cab854b52", + "shasum": "5833fabfe5b6161265d9debce5be422cab854b52" }, "require": { "php": ">=7.4" @@ -3530,8 +3533,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/utils/v3.0.18", - "reference": "459bcaf608c2c748f9736bff64bd1df7090c5a12", - "shasum": "459bcaf608c2c748f9736bff64bd1df7090c5a12" + "reference": "52a46ef030af6351ec6634987a71d15ba36f6d76", + "shasum": "52a46ef030af6351ec6634987a71d15ba36f6d76" }, "require": { "doctrine/inflector": "^2.0", @@ -3978,16 +3981,16 @@ }, { "name": "nesbot/carbon", - "version": "2.67.0", + "version": "2.68.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8" + "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/nesbot/carbon/2.67.0/nesbot-carbon-2.67.0.zip", - "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8", + "url": "https://mirrors.huaweicloud.com/repository/php/nesbot/carbon/2.68.1/nesbot-carbon-2.68.1.zip", + "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da", "shasum": "" }, "require": { @@ -4070,7 +4073,7 @@ "type": "tidelift" } ], - "time": "2023-05-25T22:09:47+00:00" + "time": "2023-06-20T18:29:04+00:00" }, { "name": "nikic/fast-route", @@ -4119,16 +4122,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/nikic/php-parser/v4.15.5/nikic-php-parser-v4.15.5.zip", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://mirrors.huaweicloud.com/repository/php/nikic/php-parser/v4.16.0/nikic-php-parser-v4.16.0.zip", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -4166,7 +4169,7 @@ "parser", "php" ], - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "nyholm/psr7", @@ -4477,16 +4480,16 @@ }, { "name": "php-amqplib/php-amqplib", - "version": "v3.5.3", + "version": "v3.5.4", "source": { "type": "git", "url": "https://github.com/php-amqplib/php-amqplib.git", - "reference": "bccaaf8ef8bcf18b4ab41e645e92537752b887bd" + "reference": "1aecbd182b35eb039667c50d7d92d71f105be779" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/php-amqplib/php-amqplib/v3.5.3/php-amqplib-php-amqplib-v3.5.3.zip", - "reference": "bccaaf8ef8bcf18b4ab41e645e92537752b887bd", + "url": "https://mirrors.huaweicloud.com/repository/php/php-amqplib/php-amqplib/v3.5.4/php-amqplib-php-amqplib-v3.5.4.zip", + "reference": "1aecbd182b35eb039667c50d7d92d71f105be779", "shasum": "" }, "require": { @@ -4549,7 +4552,7 @@ "queue", "rabbitmq" ], - "time": "2023-04-03T18:25:49+00:00" + "time": "2023-07-01T11:25:08+00:00" }, { "name": "php-di/phpdoc-reader", @@ -4660,16 +4663,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.20", + "version": "3.0.21", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67" + "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/phpseclib/phpseclib/3.0.20/phpseclib-phpseclib-3.0.20.zip", - "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67", + "url": "https://mirrors.huaweicloud.com/repository/php/phpseclib/phpseclib/3.0.21/phpseclib-phpseclib-3.0.21.zip", + "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1", "shasum": "" }, "require": { @@ -4761,7 +4764,7 @@ "type": "tidelift" } ], - "time": "2023-06-13T06:30:34+00:00" + "time": "2023-07-09T15:24:48+00:00" }, { "name": "psr/cache", @@ -8139,16 +8142,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/phpunit/php-code-coverage/9.2.26/phpunit-php-code-coverage-9.2.26.zip", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://mirrors.huaweicloud.com/repository/php/phpunit/php-code-coverage/9.2.27/phpunit-php-code-coverage-9.2.27.zip", + "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", "shasum": "" }, "require": { @@ -8207,7 +8210,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-07-26T13:44:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8432,16 +8435,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/phpunit/phpunit/9.6.9/phpunit-phpunit-9.6.9.zip", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://mirrors.huaweicloud.com/repository/php/phpunit/phpunit/9.6.10/phpunit-phpunit-9.6.10.zip", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -8525,7 +8528,7 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "sebastian/cli-parser", From 73eb50a478dcff808d8b02c13fbd16b3dbc49cbf Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 10 Aug 2023 15:23:00 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/DoctorAccountService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php index d6e5f89..57a9c56 100644 --- a/app/Services/DoctorAccountService.php +++ b/app/Services/DoctorAccountService.php @@ -339,7 +339,7 @@ class DoctorAccountService extends BaseService if ($app_env != "dev"){ // 正式环境高于300元才可以提现 if ($withdrawal_amount_total < 300){ - return fail("提现金额小于300元"); + return fail(HttpEnumCode::HTTP_ERROR,"提现金额小于300元"); } } From 98c9e0a00b36228fa704108379a9a260f403ff5d Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 10 Aug 2023 17:00:08 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=85=B7?= =?UTF-8?q?=E5=A4=84=E6=96=B9=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E3=80=82=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8log=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=84=E6=96=B9=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Amqp/Consumer/AssignPharmacistConsumer.php | 2 +- app/Services/CaService.php | 3 +-- app/Services/OrderPrescriptionService.php | 2 +- app/Services/UserDoctorService.php | 5 +++-- extend/Ca/Ca.php | 3 --- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/Amqp/Consumer/AssignPharmacistConsumer.php b/app/Amqp/Consumer/AssignPharmacistConsumer.php index 1425b9e..d5c76ac 100644 --- a/app/Amqp/Consumer/AssignPharmacistConsumer.php +++ b/app/Amqp/Consumer/AssignPharmacistConsumer.php @@ -98,7 +98,7 @@ class AssignPharmacistConsumer extends ConsumerMessage OrderPrescription::edit($params, $save_data); Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { Db::rollBack(); Log::getInstance()->error("分配药师队列执行失败原因：" . $e->getMessage()); diff --git a/app/Services/CaService.php b/app/Services/CaService.php index 7bf43c4..6d55e1a 100644 --- a/app/Services/CaService.php +++ b/app/Services/CaService.php @@ -397,7 +397,7 @@ class CaService extends BaseService $pdf->Image('@' . $img_result, 10, 10, 0, 0, '', '', '', false, 300, '', false, false, 0, false, false, false); $prescription_pdf_local_filename = $order_prescription['order_prescription_id'] . '.' . 'pdf'; - $prescription_pdf_local_path = dirname(__DIR__, 2) . "/file/prescription/"; + $prescription_pdf_local_path = BASE_PATH . "/runtime/file/prescription/"; $res = mkdirs($prescription_pdf_local_path); if (!$res){ @@ -406,7 +406,6 @@ class CaService extends BaseService // 图片生成的处方pdf存储为本地文件 runtime目录下 $pdf->Output($prescription_pdf_local_path . $prescription_pdf_local_filename, "F"); - return $prescription_img_oss_path; } diff --git a/app/Services/OrderPrescriptionService.php b/app/Services/OrderPrescriptionService.php index dd48625..aae18bc 100644 --- a/app/Services/OrderPrescriptionService.php +++ b/app/Services/OrderPrescriptionService.php @@ -198,7 +198,7 @@ class OrderPrescriptionService extends BaseService $result['file_id'] = $file_id; return $result; - } catch (\Exception $e) { + } catch (\Throwable $e) { throw new BusinessException($e->getMessage()); } } diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 545f67a..45fcb34 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -1379,6 +1379,7 @@ class UserDoctorService extends BaseService $params['product_id'] = $item['product_id']; $product = Product::getOne($params); if (empty($product)){ + Db::rollBack(); return fail(HttpEnumCode::SERVER_ERROR,"商品错误"); } @@ -1498,7 +1499,7 @@ class UserDoctorService extends BaseService } Db::commit(); - } catch (\Exception $e) { + } catch (\Throwable $e) { Db::rollBack(); return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage()); } @@ -1507,7 +1508,7 @@ class UserDoctorService extends BaseService // 发送消息-药师审核中 $ImService = new ImService(); $ImService->pharmacistVerify($order_inquiry,(string)$order_prescription->order_prescription_id,$product_name,$user_doctor['user_id'],$order_inquiry['user_id']); - }catch (\Exception $e){ + }catch (\Throwable $e){ return success([],HttpEnumCode::HTTP_SUCCESS,"消息发送失败"); } diff --git a/extend/Ca/Ca.php b/extend/Ca/Ca.php index a8b8fdf..e621b5c 100644 --- a/extend/Ca/Ca.php +++ b/extend/Ca/Ca.php @@ -54,7 +54,6 @@ abstract class Ca ] ]; - Log::getInstance()->info("获取云证书签名请求",$option); try { $response = $this->httpRequest( $this->api_url . '/cloud-certificate-service' . '/api/cloudCert/open/cert/sign', @@ -89,8 +88,6 @@ abstract class Ca ] ]; - dump($option); - try { $response = $this->httpRequest( $this->api_url . '/signgw-service/api/signature/verifyPkcs7', From 17d908ec868c3a0a3a098ad90dd0906e30bd1b60 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 10 Aug 2023 17:25:09 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 174 +++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/composer.lock b/composer.lock index 91a63b4..2a38ce5 100644 --- a/composer.lock +++ b/composer.lock @@ -1115,16 +1115,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/guzzlehttp/promises/2.0.0/guzzlehttp-promises-2.0.0.zip", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "url": "https://mirrors.huaweicloud.com/repository/php/guzzlehttp/promises/2.0.1/guzzlehttp-promises-2.0.1.zip", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { @@ -1189,20 +1189,20 @@ "type": "tidelift" } ], - "time": "2023-05-21T13:50:22+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6" + "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/guzzlehttp/psr7/2.5.0/guzzlehttp-psr7-2.5.0.zip", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6", + "url": "https://mirrors.huaweicloud.com/repository/php/guzzlehttp/psr7/2.6.0/guzzlehttp-psr7-2.6.0.zip", + "reference": "8bd7c33a0734ae1c5d074360512beb716bef3f77", "shasum": "" }, "require": { @@ -1300,7 +1300,7 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:11:26+00:00" + "time": "2023-08-03T15:06:02+00:00" }, { "name": "hyperf/amqp", @@ -1367,8 +1367,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/async-queue/v3.0.18", - "reference": "d8fd56d9643a2f8f7406cc05306531aec4b95de0", - "shasum": "d8fd56d9643a2f8f7406cc05306531aec4b95de0" + "reference": "477d7813d11661b7b8e83d3500bb99150398ec61", + "shasum": "477d7813d11661b7b8e83d3500bb99150398ec61" }, "require": { "hyperf/codec": "~3.0.0", @@ -1428,8 +1428,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/cache/v3.0.26", - "reference": "db83b8a49202aa391a8bc23b7bfd450a27283061", - "shasum": "db83b8a49202aa391a8bc23b7bfd450a27283061" + "reference": "4578ba1d3f438f2f8f07a0d4144af7a1403ee90d", + "shasum": "4578ba1d3f438f2f8f07a0d4144af7a1403ee90d" }, "require": { "hyperf/codec": "~3.0.0", @@ -1486,8 +1486,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/code-parser/v3.0.18", - "reference": "09cf5238ff84284c3200d7faff552adfc14a6ebf", - "shasum": "09cf5238ff84284c3200d7faff552adfc14a6ebf" + "reference": "89d74d0ac53e6caa28d489c00f74ab8c151e7344", + "shasum": "89d74d0ac53e6caa28d489c00f74ab8c151e7344" }, "require": { "hyperf/collection": "~3.0.0", @@ -1538,8 +1538,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/codec/v3.0.30", - "reference": "b9424b52cfca296fc819d785fff30c7eea36cd3b", - "shasum": "b9424b52cfca296fc819d785fff30c7eea36cd3b" + "reference": "b0c06dc71ab7471ff1a42047fb0cdf0e56faa2a3", + "shasum": "b0c06dc71ab7471ff1a42047fb0cdf0e56faa2a3" }, "require": { "ext-json": "*", @@ -1589,8 +1589,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/collection/v3.0.29", - "reference": "455aa584f4b5277c46b4c2a3e76b03417054a3e6", - "shasum": "455aa584f4b5277c46b4c2a3e76b03417054a3e6" + "reference": "71be6bdaa2e739b5d205d3c430f592b71c8835f7", + "shasum": "71be6bdaa2e739b5d205d3c430f592b71c8835f7" }, "require": { "hyperf/contract": "~3.0.0", @@ -1639,8 +1639,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/command/v3.0.27", - "reference": "73d3160c752913676d8ada632d498ec423fe425b", - "shasum": "73d3160c752913676d8ada632d498ec423fe425b" + "reference": "e7c99353b3d03e6a55a7a8a1ef44ea9ceee9ff51", + "shasum": "e7c99353b3d03e6a55a7a8a1ef44ea9ceee9ff51" }, "require": { "hyperf/support": "~3.0.0", @@ -1685,8 +1685,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/conditionable/v3.0.0", - "reference": "acf1854ba2beadaa7a2248e46f44841bf4e57c67", - "shasum": "acf1854ba2beadaa7a2248e46f44841bf4e57c67" + "reference": "b758b9a4b1b248b5bb8a5aa02c8d043e6182c3d5", + "shasum": "b758b9a4b1b248b5bb8a5aa02c8d043e6182c3d5" }, "require": { "php": ">=7.4" @@ -1730,8 +1730,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/config/v3.0.20", - "reference": "44d1e4636661f0572512a94169fd2a2bfbbc8b2d", - "shasum": "44d1e4636661f0572512a94169fd2a2bfbbc8b2d" + "reference": "d719449bb2b75455f410d4c718b65d74f686273b", + "shasum": "d719449bb2b75455f410d4c718b65d74f686273b" }, "require": { "hyperf/collection": "~3.0.0", @@ -1794,8 +1794,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/constants/v3.0.18", - "reference": "714b07a448671f5c09b907a8d3bcd570bb1396a9", - "shasum": "714b07a448671f5c09b907a8d3bcd570bb1396a9" + "reference": "733009cca5e1a264488b483ef9f017073854bff3", + "shasum": "733009cca5e1a264488b483ef9f017073854bff3" }, "require": { "hyperf/di": "~3.0.0", @@ -1847,8 +1847,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/context/v3.0.18", - "reference": "79de6266d5c0603d545362a0657856e13e357a46", - "shasum": "79de6266d5c0603d545362a0657856e13e357a46" + "reference": "35cabcd8756b8eff1f6b72352389cb7f6f823627", + "shasum": "35cabcd8756b8eff1f6b72352389cb7f6f823627" }, "require": { "hyperf/engine": "^1.2|^2.0", @@ -1893,8 +1893,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/contract/v3.0.10", - "reference": "6f5eb5e3d979e1fabbc7e1bd7e80c98121a5d14a", - "shasum": "6f5eb5e3d979e1fabbc7e1bd7e80c98121a5d14a" + "reference": "5d1d146ea199b538b7be4714951df6b9a8c5ea31", + "shasum": "5d1d146ea199b538b7be4714951df6b9a8c5ea31" }, "require": { "php": ">=8.0" @@ -1932,8 +1932,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/coordinator/v3.0.22", - "reference": "614412a4502ad06b31f628711444bd56f1e3ee22", - "shasum": "614412a4502ad06b31f628711444bd56f1e3ee22" + "reference": "bb78c3fa09045b8bc09b5f49e093f82a3865ebec", + "shasum": "bb78c3fa09045b8bc09b5f49e093f82a3865ebec" }, "require": { "hyperf/engine": "^1.2|^2.0", @@ -1978,8 +1978,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/coroutine/v3.0.16", - "reference": "7f1d81bba50f1af8f6b909b771c3e9269619fa29", - "shasum": "7f1d81bba50f1af8f6b909b771c3e9269619fa29" + "reference": "39250744200eeabfef0b01d4c8b197ea9ff0e1dd", + "shasum": "39250744200eeabfef0b01d4c8b197ea9ff0e1dd" }, "require": { "hyperf/context": "~3.0.0", @@ -2080,8 +2080,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/database/v3.0.30", - "reference": "0d56e81769593fa693de44ab80ac9882eb905b38", - "shasum": "0d56e81769593fa693de44ab80ac9882eb905b38" + "reference": "afcadd4d7835861595d522e83270009494c5f8d6", + "shasum": "afcadd4d7835861595d522e83270009494c5f8d6" }, "require": { "hyperf/code-parser": "~3.0.0", @@ -2194,8 +2194,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/di/v3.0.24", - "reference": "53969f159a586b7256927fab837f0675db777a3e", - "shasum": "53969f159a586b7256927fab837f0675db777a3e" + "reference": "ca880c25d039dd08f24a7d162dab247a3c1418e7", + "shasum": "ca880c25d039dd08f24a7d162dab247a3c1418e7" }, "require": { "doctrine/instantiator": "^1.0", @@ -2256,8 +2256,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/dispatcher/v3.0.24", - "reference": "eca5620db1a71a5b9b485ae22a5fcd2f62260258", - "shasum": "eca5620db1a71a5b9b485ae22a5fcd2f62260258" + "reference": "3212e84825cc593f3b16e984051c74116bb46e3c", + "shasum": "3212e84825cc593f3b16e984051c74116bb46e3c" }, "require": { "hyperf/contract": "~3.0.0", @@ -2361,8 +2361,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/event/v3.0.0", - "reference": "687743ca1f3643276f19bd232180221814431ee1", - "shasum": "687743ca1f3643276f19bd232180221814431ee1" + "reference": "d56b753f2d0dbfe3f5a5075b9d5c8cefa7f00fd8", + "shasum": "d56b753f2d0dbfe3f5a5075b9d5c8cefa7f00fd8" }, "require": { "hyperf/contract": "~3.0.0", @@ -2414,8 +2414,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/exception-handler/v3.0.24", - "reference": "6c024d3021cf0c115c3ac80eb8c92e365cb1c2c7", - "shasum": "6c024d3021cf0c115c3ac80eb8c92e365cb1c2c7" + "reference": "18d928d28304da9c124eec4648caa060581283ea", + "shasum": "18d928d28304da9c124eec4648caa060581283ea" }, "require": { "hyperf/contract": "~3.0.0", @@ -2467,8 +2467,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/framework/v3.0.23", - "reference": "990cc53e7230d165ef94d06faa31837b196e9dcd", - "shasum": "990cc53e7230d165ef94d06faa31837b196e9dcd" + "reference": "c0b527b1905782082c944ab0e6c9fdef5e6505a5", + "shasum": "c0b527b1905782082c944ab0e6c9fdef5e6505a5" }, "require": { "fig/http-message-util": "^1.1.2", @@ -2531,8 +2531,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/guzzle/v3.0.24", - "reference": "ede3ea8aca5fa88163ad706ba0e2234a4e9e73cd", - "shasum": "ede3ea8aca5fa88163ad706ba0e2234a4e9e73cd" + "reference": "637ced9e55158db68455b160c20c9d5b328eda0d", + "shasum": "637ced9e55158db68455b160c20c9d5b328eda0d" }, "require": { "guzzlehttp/guzzle": "^6.3|^7.0", @@ -2580,8 +2580,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/http-message/v3.0.18", - "reference": "1fed954be30f9ff185360efe5f6f4b774e70194b", - "shasum": "1fed954be30f9ff185360efe5f6f4b774e70194b" + "reference": "28398e352b4b6e56e4109b2b40c62de6cafe9a8a", + "shasum": "28398e352b4b6e56e4109b2b40c62de6cafe9a8a" }, "require": { "hyperf/codec": "~3.0.0", @@ -2631,8 +2631,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/http-server/v3.0.24", - "reference": "23bf6fd698b22177dfe8a7595c6956becb04c9d9", - "shasum": "23bf6fd698b22177dfe8a7595c6956becb04c9d9" + "reference": "d786e5324f04baa17812909ab7665cb07f376d3b", + "shasum": "d786e5324f04baa17812909ab7665cb07f376d3b" }, "require": { "hyperf/codec": "~3.0.0", @@ -2698,8 +2698,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/logger/v3.0.20", - "reference": "b41374876dbf782bc330223b1b0c3df2c51337e4", - "shasum": "b41374876dbf782bc330223b1b0c3df2c51337e4" + "reference": "b00476c1fb637559f800dcd0ac759a44335200ea", + "shasum": "b00476c1fb637559f800dcd0ac759a44335200ea" }, "require": { "hyperf/contract": "~3.0.0", @@ -2751,8 +2751,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/macroable/v3.0.0", - "reference": "b76659a7708e3508b84a7cc8a0b99d4e0a6119e3", - "shasum": "b76659a7708e3508b84a7cc8a0b99d4e0a6119e3" + "reference": "3785664bd3ae413b9755f7e3529d609962ac4cf4", + "shasum": "3785664bd3ae413b9755f7e3529d609962ac4cf4" }, "require": { "php": ">=7.4" @@ -2840,8 +2840,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/model-listener/v3.0.18", - "reference": "15a7741288efc696f88abba7683e74a0413a41db", - "shasum": "15a7741288efc696f88abba7683e74a0413a41db" + "reference": "2d53cea4d4b1c023bbdc0c5868deedae969c164c", + "shasum": "2d53cea4d4b1c023bbdc0c5868deedae969c164c" }, "require": { "hyperf/contract": "~3.0.0", @@ -2946,8 +2946,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/pipeline/v3.0.16", - "reference": "351149a128c9be0e8388f5c77baab1464a391253", - "shasum": "351149a128c9be0e8388f5c77baab1464a391253" + "reference": "7282ee6775443a25b75f093d68ff8bef7d07ea66", + "shasum": "7282ee6775443a25b75f093d68ff8bef7d07ea66" }, "require": { "php": ">=8.0", @@ -2992,8 +2992,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/pool/v3.0.18", - "reference": "a51177e8c498d2231151593fcb95e92d168c5ebc", - "shasum": "a51177e8c498d2231151593fcb95e92d168c5ebc" + "reference": "f60ac0b2bd6c7cefdedced75ae781834b17e31ef", + "shasum": "f60ac0b2bd6c7cefdedced75ae781834b17e31ef" }, "require": { "hyperf/contract": "~3.0.0", @@ -3044,8 +3044,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/process/v3.0.22", - "reference": "06ea5fa5b3267eb2685715b7679b69f968e61986", - "shasum": "06ea5fa5b3267eb2685715b7679b69f968e61986" + "reference": "d245ebd64644c1b0e82decdd19bf40eb1f9828fa", + "shasum": "d245ebd64644c1b0e82decdd19bf40eb1f9828fa" }, "require": { "hyperf/contract": "~3.0.0", @@ -3101,8 +3101,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/redis/v3.0.21", - "reference": "21510bbfa31387643ae7ac138368b58b93e61cf6", - "shasum": "21510bbfa31387643ae7ac138368b58b93e61cf6" + "reference": "64fad3232502d69e93b759ad19a48656a9439cc0", + "shasum": "64fad3232502d69e93b759ad19a48656a9439cc0" }, "require": { "ext-redis": "*", @@ -3160,8 +3160,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/serializer/v3.0.0", - "reference": "ba7659a4f9928aa6f46c47649d1b9fa2fed379c8", - "shasum": "ba7659a4f9928aa6f46c47649d1b9fa2fed379c8" + "reference": "2f8919fee2b214840b18fb9c6c6b7708d00ce21f", + "shasum": "2f8919fee2b214840b18fb9c6c6b7708d00ce21f" }, "require": { "hyperf/contract": "~3.0.0", @@ -3214,8 +3214,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/server/v3.0.24", - "reference": "8129ef965778acb97b0977d751e9a7b17c85ba21", - "shasum": "8129ef965778acb97b0977d751e9a7b17c85ba21" + "reference": "edb75947918678788441e2748de88856a60a281c", + "shasum": "edb75947918678788441e2748de88856a60a281c" }, "require": { "hyperf/contract": "~3.0.0", @@ -3319,12 +3319,12 @@ }, { "name": "hyperf/stringable", - "version": "v3.0.27", + "version": "v3.0.31", "dist": { "type": "zip", - "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/stringable/v3.0.27", - "reference": "17cf616de2698100364d0381861fc18fd64a3f07", - "shasum": "17cf616de2698100364d0381861fc18fd64a3f07" + "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/stringable/v3.0.31", + "reference": "8559d8a3c4828667d9e2c943a03f6933e703d0c5", + "shasum": "8559d8a3c4828667d9e2c943a03f6933e703d0c5" }, "require": { "hyperf/collection": "~3.0.0", @@ -3380,8 +3380,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/support/v3.0.24", - "reference": "2f30401ef07803829376334b2afdaa05a17af358", - "shasum": "2f30401ef07803829376334b2afdaa05a17af358" + "reference": "2b752ac43c21f43f656394ad016260ec6b5325cc", + "shasum": "2b752ac43c21f43f656394ad016260ec6b5325cc" }, "require": { "hyperf/collection": "~3.0.0", @@ -3437,8 +3437,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/tappable/v3.0.0", - "reference": "5833fabfe5b6161265d9debce5be422cab854b52", - "shasum": "5833fabfe5b6161265d9debce5be422cab854b52" + "reference": "0d57f5e03f22a1f86a6b9838a6d44352e394b637", + "shasum": "0d57f5e03f22a1f86a6b9838a6d44352e394b637" }, "require": { "php": ">=7.4" @@ -3533,8 +3533,8 @@ "dist": { "type": "zip", "url": "https://hyperf-cloud-composer.pkg.coding.net/limingxinleo/proxy/archive/hyperf/utils/v3.0.18", - "reference": "52a46ef030af6351ec6634987a71d15ba36f6d76", - "shasum": "52a46ef030af6351ec6634987a71d15ba36f6d76" + "reference": "b725f20b55609b2eae1711eea2be62c316144550", + "shasum": "b725f20b55609b2eae1711eea2be62c316144550" }, "require": { "doctrine/inflector": "^2.0", @@ -8996,16 +8996,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/sebastian/global-state/5.0.5/sebastian-global-state-5.0.5.zip", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://mirrors.huaweicloud.com/repository/php/sebastian/global-state/5.0.6/sebastian-global-state-5.0.6.zip", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -9051,7 +9051,7 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", From c16cc485cdf67b91996eadc0bd73b128014af9ca Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 7 Sep 2023 17:13:11 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=A4=84=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BC=96=E5=8F=B7=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/OrderPrescriptionService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/OrderPrescriptionService.php b/app/Services/OrderPrescriptionService.php index aae18bc..fab3007 100644 --- a/app/Services/OrderPrescriptionService.php +++ b/app/Services/OrderPrescriptionService.php @@ -389,7 +389,7 @@ class OrderPrescriptionService extends BaseService } $arg = array(); - $arg['terminalCode'] = "ZD-10003"; + $arg['terminalCode'] = \Hyperf\Config\config("pharmacy_code","ZD-10003"); $arg['orderNo'] = $order_product['order_product_no']; // 订单编号 $arg['transactNo'] = $order_product['escrow_trade_no']; // 流水单号 $arg['payDate'] = $order_product['pay_time']; // 支付时间 From 592f9cb7b4924bcd8965a2dd50c9d206aa107a86 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 8 Sep 2023 10:31:49 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=B8=BAzd10003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/OrderPrescriptionService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/OrderPrescriptionService.php b/app/Services/OrderPrescriptionService.php index fab3007..aae18bc 100644 --- a/app/Services/OrderPrescriptionService.php +++ b/app/Services/OrderPrescriptionService.php @@ -389,7 +389,7 @@ class OrderPrescriptionService extends BaseService } $arg = array(); - $arg['terminalCode'] = \Hyperf\Config\config("pharmacy_code","ZD-10003"); + $arg['terminalCode'] = "ZD-10003"; $arg['orderNo'] = $order_product['order_product_no']; // 订单编号 $arg['transactNo'] = $order_product['escrow_trade_no']; // 流水单号 $arg['payDate'] = $order_product['pay_time']; // 支付时间 From 3d38ed9da43c9d1008fb15fcbeaafb6ab8d61460 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Nov 2023 13:58:34 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E6=9C=AA=E6=8E=A5=E8=AF=8A=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/MessagePush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index ccde9f2..bbd699f 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1177,7 +1177,7 @@ class MessagePush extends BaseService $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; - $data['link_type'] = 1; // 聊天详情页 + $data['link_type'] = 3; // 问诊消息列表页 $link_params = array(); $link_params['order_inquiry_id'] = $this->order_inquiry['order_inquiry_id']; From 8cbbd848f394bb94a24ba0c1ce3192e4cbb5d081 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Nov 2023 14:44:48 +0800 Subject: [PATCH 10/28] 1 --- app/Services/MessagePush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index bbd699f..2ecdef3 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1177,7 +1177,7 @@ class MessagePush extends BaseService $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; - $data['link_type'] = 3; // 问诊消息列表页 + $data['link_type'] = 3; // 问诊消息列表页. $link_params = array(); $link_params['order_inquiry_id'] = $this->order_inquiry['order_inquiry_id']; From f57a1720d255c9e6f8936a348ff7e3aa99af3b47 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Nov 2023 15:26:14 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/MessagePush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 2ecdef3..b634b5d 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1315,7 +1315,7 @@ class MessagePush extends BaseService $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的电子处方已审核通过，请注意查看。"; $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的电子处方已审核通过，请注意查看。"; $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的电子处方已审核通过，请注意查看。"; - $data['link_type'] = 1; // 聊天详情页 + $data['link_type'] = 3; // 问诊消息列表页 $link_params = array(); $link_params['order_inquiry_id'] = $this->order_inquiry['order_inquiry_id']; From bb60464a5704353f34e631938b628d1bd101d044 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Nov 2023 15:30:50 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8C=BB=E7=94=9Fxx=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=90=8E=E8=BF=98=E6=9C=AA=E6=8E=A5=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/MessagePush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index b634b5d..4b1fa0b 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1177,7 +1177,7 @@ class MessagePush extends BaseService $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; - $data['link_type'] = 3; // 问诊消息列表页. + $data['link_type'] = 3; // 问诊消息列表页 $link_params = array(); $link_params['order_inquiry_id'] = $this->order_inquiry['order_inquiry_id']; From 1d16a1265bc06b00fc80324c4ed10ccc33009a77 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Nov 2023 15:41:33 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8C=BB=E7=94=9Fxx=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=90=8E=E8=BF=98=E6=9C=AA=E6=8E=A5=E8=AF=8A=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/MessagePush.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 4b1fa0b..4eaa234 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -1174,9 +1174,9 @@ class MessagePush extends BaseService $data['notice_type'] = 1; $data['inquiry_type'] = $this->order_inquiry['inquiry_type']; // 问诊类型（医生端服务通知存在 1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） $data['from_name'] = "肝胆小秘书"; - $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; - $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; - $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请注意查看。"; + $data['notice_brief_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请及时处理。"; + $data['notice_title'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请及时处理。"; + $data['notice_content'] = "{$this->order_inquiry['patient_name']}患者的问诊您还未接诊，请及时处理。"; $data['link_type'] = 3; // 问诊消息列表页 $link_params = array(); @@ -1201,10 +1201,10 @@ class MessagePush extends BaseService $sub_data['wx_template_id'] = "G1RIs0RYqsTQ2CuPQWalIMyb6_deuEEbJfajfhGvNzc"; // 咨询提醒 $sub_data['params']['page'] = "Pages/yishi/wenzhen_v2/wenzhen"; $sub_data['params']['data'] = [ - "thing1" => "您好医生，{$this->order_inquiry['patient_name']}患者的（{$inquiry_type}）服务您还未接诊；",// 提醒内容 + "thing1" => "您好医生，有新的问诊服务您还未接诊",// 提醒内容 "name2" => $this->order_inquiry['patient_name'],// 患者姓名 "thing4" => mb_substr($order_inquiry_case['disease_desc'], 0, 18),// 病情描述 - "thing6" => "24小时内未接诊，平台将自动取消问诊。",// 提示说明 + "thing6" => "您还未接诊，请及时上线处理",// 提示说明 "thing5" => "",// 咨询内容 ]; From a583a9fddae5c5fa34c6c768eef4dc1d423fa0ad Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 7 Dec 2023 14:03:28 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=84=E6=96=B9=E5=B9=B3=E5=8F=B0=E5=95=86=E5=93=81=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8D=AF=E5=BA=97=E7=BC=96=E7=A0=81=E8=AF=86?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/getProductCommand.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app/Command/getProductCommand.php b/app/Command/getProductCommand.php index e303f7c..aa4a64c 100644 --- a/app/Command/getProductCommand.php +++ b/app/Command/getProductCommand.php @@ -43,7 +43,7 @@ class getProductCommand extends HyperfCommand $page = 1; $page_size = 100; $result = $prescription->getProd(1, 100); - if (!empty($result['rows'])){ + if (!empty($result['rows'])) { foreach ($result['rows'] as $item) { // 执行入库 $this->handleData($item); @@ -55,7 +55,7 @@ class getProductCommand extends HyperfCommand for ($i = 2; $i < $count; $i++) { try { $result = $prescription->getProd($i, $page_size); - if (!isset($result['rows'])){ + if (!isset($result['rows'])) { continue; } @@ -63,7 +63,7 @@ class getProductCommand extends HyperfCommand // 执行入库 $this->handleData($item); } - }catch (\Exception $e){ + } catch (\Exception $e) { $this->line("部分商品更新失败：" . $e->getMessage()); } } @@ -109,6 +109,23 @@ class getProductCommand extends HyperfCommand return false; } + if (empty($item['thirdCode'])) { + Db::rollBack(); +// $this->line("商品更新失败，缺少药品价格" . json_encode($item, JSON_UNESCAPED_UNICODE)); + return false; + } + + $pharmacy_code = \Hyperf\Config\config("prescription_platform.pharmacy_code"); + if (empty($pharmacy_code)) { + $pharmacy_code = "JG-10009"; + } + + // 非药店编码 + if ($pharmacy_code != $item['thirdCode']) { + Db::rollBack(); + return false; + } + // 查询是否存在 $params = array(); $params['product_platform_code'] = $item['drugCode']; @@ -254,7 +271,7 @@ class getProductCommand extends HyperfCommand $data['product_platform_code'] = $item['drugCode']; // 第三方药店商品编码 - if (isset($item['thirdDrugCode'])){ + if (isset($item['thirdDrugCode'])) { $data['product_pharmacy_code'] = $item['thirdDrugCode']; } From 80c5d22e2e01c24599a802be651931fd8d03f61e Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 8 Dec 2023 13:10:03 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/getProductCommand.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Command/getProductCommand.php b/app/Command/getProductCommand.php index aa4a64c..0ba4527 100644 --- a/app/Command/getProductCommand.php +++ b/app/Command/getProductCommand.php @@ -126,6 +126,8 @@ class getProductCommand extends HyperfCommand return false; } + Log::getInstance("xiaomeiqiu")->info(json_encode($item,JSON_UNESCAPED_UNICODE)); + // 查询是否存在 $params = array(); $params['product_platform_code'] = $item['drugCode']; From b4d96fd5f53d2f053445881e22ad42f753bad9b3 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 8 Dec 2023 14:24:22 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/getProductCommand.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Command/getProductCommand.php b/app/Command/getProductCommand.php index 0ba4527..aa4a64c 100644 --- a/app/Command/getProductCommand.php +++ b/app/Command/getProductCommand.php @@ -126,8 +126,6 @@ class getProductCommand extends HyperfCommand return false; } - Log::getInstance("xiaomeiqiu")->info(json_encode($item,JSON_UNESCAPED_UNICODE)); - // 查询是否存在 $params = array(); $params['product_platform_code'] = $item['drugCode']; From 89ca8470d859abc625b26e5d46a18445b6cbbab3 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Fri, 8 Dec 2023 16:39:28 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/getProductCommand.php | 64 ++++++++++++------------------- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/app/Command/getProductCommand.php b/app/Command/getProductCommand.php index aa4a64c..9d61b2b 100644 --- a/app/Command/getProductCommand.php +++ b/app/Command/getProductCommand.php @@ -94,27 +94,29 @@ class getProductCommand extends HyperfCommand */ protected function handleData(array $item): bool { + if (empty($item['drugCode'])) { + return false; + } + + if (empty($item['drugPrice'])) { + return false; + } + + if (empty($item['thirdCode'])) { + return false; + } + + if (empty($item['thirdDrugCode'])) { + return false; + } + + if (empty($item['approvalNumber'])) { + return false; + } + try { Db::beginTransaction(); - if (empty($item['drugCode'])) { - Db::rollBack(); -// $this->line("商品更新失败，缺少平台药品编码" . json_encode($item, JSON_UNESCAPED_UNICODE)); - return false; - } - - if (empty($item['drugPrice'])) { - Db::rollBack(); -// $this->line("商品更新失败，缺少药品价格" . json_encode($item, JSON_UNESCAPED_UNICODE)); - return false; - } - - if (empty($item['thirdCode'])) { - Db::rollBack(); -// $this->line("商品更新失败，缺少药品价格" . json_encode($item, JSON_UNESCAPED_UNICODE)); - return false; - } - $pharmacy_code = \Hyperf\Config\config("prescription_platform.pharmacy_code"); if (empty($pharmacy_code)) { $pharmacy_code = "JG-10009"; @@ -129,6 +131,8 @@ class getProductCommand extends HyperfCommand // 查询是否存在 $params = array(); $params['product_platform_code'] = $item['drugCode']; + $params['product_pharmacy_code'] = $item['thirdDrugCode']; + $params['license_number'] = $item['approvalNumber']; $product_platform = ProductPlatform::getOne($params); if (!empty($product_platform)) { // 已存在，更新 @@ -173,14 +177,6 @@ class getProductCommand extends HyperfCommand } } - // 批准文号 - if (isset($item['approvalNumber'])) { - if ($product_platform['license_number'] != $item['approvalNumber']) { - $product_platform_data['license_number'] = $item['approvalNumber']; - $product_data['license_number'] = $item['approvalNumber']; - } - } - // 生产厂家 if (isset($item['manufacturer'])) { if ($product_platform['manufacturer'] != $item['manufacturer']) { @@ -197,14 +193,6 @@ class getProductCommand extends HyperfCommand } } - // 第三方药店商品编码 - if (isset($item['thirdDrugCode'])) { - if ($product_platform['product_pharmacy_code'] != $item['thirdDrugCode']) { - $product_platform_data['product_pharmacy_code'] = $item['thirdDrugCode']; - $product_data['product_pharmacy_code'] = $item['thirdDrugCode']; - } - } - // 基本包装数量 if (isset($item['basicPackingCount'])) { if ($product_platform['packaging_count'] != $item['basicPackingCount']) { @@ -271,9 +259,7 @@ class getProductCommand extends HyperfCommand $data['product_platform_code'] = $item['drugCode']; // 第三方药店商品编码 - if (isset($item['thirdDrugCode'])) { - $data['product_pharmacy_code'] = $item['thirdDrugCode']; - } + $data['product_pharmacy_code'] = $item['thirdDrugCode']; // 商品规格 if (isset($item['specifications'])) { @@ -281,9 +267,7 @@ class getProductCommand extends HyperfCommand } // 批准文号 - if (isset($item['approvalNumber'])) { - $data['license_number'] = $item['approvalNumber']; - } + $data['license_number'] = $item['approvalNumber']; // 生产厂家 if (isset($item['manufacturer'])) { From aaf8ae7218236d9071e02b939d2a91a6391683c8 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 26 Dec 2023 15:51:09 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9B=91=E7=AE=A1?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9Eca=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=80=BC=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/ReportRegulatoryCommand.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/app/Command/ReportRegulatoryCommand.php b/app/Command/ReportRegulatoryCommand.php index 4badcf4..e3c40f3 100644 --- a/app/Command/ReportRegulatoryCommand.php +++ b/app/Command/ReportRegulatoryCommand.php @@ -14,6 +14,7 @@ use App\Model\OrderPrescriptionProduct; use App\Model\PatientFamily; use App\Model\Product; use App\Model\ReportRegulatory; +use App\Model\UserCaCert; use App\Model\UserDoctor; use App\Model\UserDoctorInfo; use App\Model\UserPharmacist; @@ -418,6 +419,26 @@ class ReportRegulatoryCommand extends HyperfCommand return false; } + // 获取医生ca数据 + $params = array(); + $params['user_id'] = $user_doctor['user_id']; + $params['type'] = 2; + $doctor_user_ca_cert = UserCaCert::getOne($params); + if (empty($doctor_user_ca_cert)){ + $this->line("错误：无医生ca数据"); + return false; + } + + // 获取药师ca数据 + $params = array(); + $params['user_id'] = $user_pharmacist['user_id']; + $params['type'] = 2; + $pharmacist_user_ca_cert = UserCaCert::getOne($params); + if (empty($pharmacist_user_ca_cert)){ + $this->line("错误：无药师ca数据"); + return false; + } + $data = array(); $data['thirdUniqueid'] = $order_inquiry['order_inquiry_id']; // 唯一标识 $data['orgName'] = "成都金牛欣欣相照互联网医院"; // 机构名称 @@ -455,6 +476,8 @@ class ReportRegulatoryCommand extends HyperfCommand $data['drugPackage'] = $order_prescription_product['drug_package']; // 药品包装 $data['recipeAllPrice'] = $order_prescription_product['amount_total']; // 处方总价 $data['uploadTime'] = date("Y-m-d H:i:s",time()); // 上传时间 + $data['docCaSign'] = $doctor_user_ca_cert['cert_base64']; // 医师ca签名值 + $data['pharmacistCaSign'] = $pharmacist_user_ca_cert['cert_base64']; // 药师ca签名值 $data['recipeNo'] = $order_prescription['order_prescription_id']; // 医院处方编号 $data['cityId'] = "510100"; // 城市ID(参考地区字段) From 4dda3ada59f1510b7dada1d438e16d1bcf7cb731 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 26 Dec 2023 15:56:41 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=8A=B5=E9=80=9A=E7=9F=A5=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/CouponService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/CouponService.php b/app/Services/CouponService.php index 65473b4..e2d6dcb 100644 --- a/app/Services/CouponService.php +++ b/app/Services/CouponService.php @@ -151,7 +151,7 @@ class CouponService extends BaseService try { // 添加优惠卷即将过期提醒队列 - $time = floor($time * 0.25); + $time = floor($time * 0.75); // 时间低于5小时，不进行过期提醒 if ($time > 60 * 60 * 5){ From 9b4bc2a51a8423c986ae7fa80a3dff1fa19a3500 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Mon, 15 Jan 2024 10:29:35 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=80=E6=AC=BE=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/CallBackController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 10a06cf..6b5073f 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -538,7 +538,7 @@ class CallBackController extends AbstractController try { // 处理支付结果事件 - $WechatPay = new WechatPay(1, 1); + $WechatPay = new WechatPay(1, 2); $app = $WechatPay->createApp(); $server = $app->getServer(); From ab7f8ad29535865032a930ea388818c6c629c2ec Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Mon, 18 Mar 2024 13:04:53 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Amqp/Consumer/UserImOffDelayDirectConsumer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Amqp/Consumer/UserImOffDelayDirectConsumer.php b/app/Amqp/Consumer/UserImOffDelayDirectConsumer.php index 0d7e309..fc050ce 100644 --- a/app/Amqp/Consumer/UserImOffDelayDirectConsumer.php +++ b/app/Amqp/Consumer/UserImOffDelayDirectConsumer.php @@ -61,8 +61,8 @@ class UserImOffDelayDirectConsumer extends ConsumerMessage $im_login_at = strtotime($user['im_login_at']); $diff_time = time() - $im_login_at; -// if ($diff_time <= (30 * 60 + 10)){ - if ($diff_time <= (2 * 50)){ + if ($diff_time <= (30 * 60 + 10)){ +// if ($diff_time <= (2 * 50)){ Log::getInstance("queue-UserImOff")->info("用户刚上线未满30分钟，无需处理"); return Result::ACK; } From 0d173902e8d7437f08749677cdcea0c554e430a2 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 27 Mar 2024 16:26:15 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=93=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/DoctorAuthService.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 74d8a89..382dc40 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -882,6 +882,11 @@ class DoctorAuthService extends BaseService if ($doctor_iden_fail['field_name'] == "be_good_at") { $result[$doctor_iden_fail['field_name']] = $doctor_iden_fail['fail_reason']; } + + // 专长 + if ($doctor_iden_fail['field_name'] == "doctor_expertise") { + $result[$doctor_iden_fail['field_name']] = $doctor_iden_fail['fail_reason']; + } } return success($result); From 831e59842ad0a2fb2a571eaa70d93f6dfee74e55 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 27 Mar 2024 17:33:36 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/DoctorIdenFail.php | 10 ++++++++ app/Model/DoctorIntroductionRecord.php | 10 ++++++++ app/Services/DoctorAuthService.php | 35 ++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/app/Model/DoctorIdenFail.php b/app/Model/DoctorIdenFail.php index 691b7f7..7ef460d 100644 --- a/app/Model/DoctorIdenFail.php +++ b/app/Model/DoctorIdenFail.php @@ -54,4 +54,14 @@ class DoctorIdenFail extends Model { return self::where($params)->get($fields); } + + /** + * 删除 + * @param array $params + * @return int|mixed + */ + public static function del(array $params): mixed + { + return self::where($params)->delete(); + } } diff --git a/app/Model/DoctorIntroductionRecord.php b/app/Model/DoctorIntroductionRecord.php index 510aa17..90fece5 100644 --- a/app/Model/DoctorIntroductionRecord.php +++ b/app/Model/DoctorIntroductionRecord.php @@ -92,4 +92,14 @@ class DoctorIntroductionRecord extends Model ->first($fields); } + /** + * 删除 + * @param array $params + * @return int|mixed + */ + public static function del(array $params): mixed + { + return self::where($params)->delete(); + } + } diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 382dc40..9e5499c 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -645,6 +645,18 @@ class DoctorAuthService extends BaseService } } + // 删除认证失败字段 + if ($doctor['iden_auth_status'] == 3){ + // 删除认证失败字段 + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $res = DoctorIdenFail::del($params); + if (!$res){ + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR); + } + } + Db::commit(); } catch (\Exception $e) { Db::rollBack(); @@ -1136,6 +1148,27 @@ class DoctorAuthService extends BaseService Db::beginTransaction(); try { + // 审核不通过 + if ($doctor['iden_auth_status'] == 3){ + // 删除认证失败字段 + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $res = DoctorIdenFail::del($params); + if (!$res){ + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR); + } + + // 删除简介修改记录表 + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $res = DoctorIntroductionRecord::del($params); + if (!$res){ + Db::rollBack(); + return fail(HttpEnumCode::SERVER_ERROR); + } + } + // 新增医生简介修改记录表 $doctor_introduction_record_data['doctor_id'] = $doctor['doctor_id']; $doctor_introduction_record = DoctorIntroductionRecord::addDoctorIntroductionRecord($doctor_introduction_record_data); @@ -1157,6 +1190,8 @@ class DoctorAuthService extends BaseService return fail(HttpEnumCode::SERVER_ERROR); } + + Db::commit(); } catch (\Exception $e) { Db::rollBack(); From 8b4c7cc17a95f5a7009fa416b04249b0c1f88045 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 27 Mar 2024 18:13:34 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/DoctorAuthService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 9e5499c..9375ee6 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -1149,7 +1149,7 @@ class DoctorAuthService extends BaseService Db::beginTransaction(); try { // 审核不通过 - if ($doctor['iden_auth_status'] == 3){ + if ($doctor['introduction_status'] == 3){ // 删除认证失败字段 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; From 1668c5382ca3a76196f404a19a52d2b2b568b6e5 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Thu, 28 Mar 2024 10:26:21 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/DoctorAuthService.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 9375ee6..097072d 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -650,11 +650,7 @@ class DoctorAuthService extends BaseService // 删除认证失败字段 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; - $res = DoctorIdenFail::del($params); - if (!$res){ - Db::rollBack(); - return fail(HttpEnumCode::SERVER_ERROR); - } + DoctorIdenFail::del($params); } Db::commit(); @@ -1153,20 +1149,12 @@ class DoctorAuthService extends BaseService // 删除认证失败字段 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; - $res = DoctorIdenFail::del($params); - if (!$res){ - Db::rollBack(); - return fail(HttpEnumCode::SERVER_ERROR); - } + DoctorIdenFail::del($params); // 删除简介修改记录表 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; - $res = DoctorIntroductionRecord::del($params); - if (!$res){ - Db::rollBack(); - return fail(HttpEnumCode::SERVER_ERROR); - } + DoctorIntroductionRecord::del($params); } // 新增医生简介修改记录表 @@ -1190,8 +1178,6 @@ class DoctorAuthService extends BaseService return fail(HttpEnumCode::SERVER_ERROR); } - - Db::commit(); } catch (\Exception $e) { Db::rollBack(); From b9df31e447046ba91d567a70a19541370ee4cef9 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Fri, 29 Mar 2024 16:47:47 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=9B=B4=E6=94=B9log=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9model=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/DoctorInquiryConfig.php | 2 +- app/Model/DoctorInquiryConfigService.php | 4 ++-- app/Model/OrderInquiry.php | 4 ++-- app/Model/SystemInquiryConfig.php | 2 +- config/autoload/logger.php | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Model/DoctorInquiryConfig.php b/app/Model/DoctorInquiryConfig.php index 5a81372..dc722de 100644 --- a/app/Model/DoctorInquiryConfig.php +++ b/app/Model/DoctorInquiryConfig.php @@ -13,7 +13,7 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property string $inquiry_config_id 主键id * @property string $doctor_id 医生id * @property int $inquiry_type 接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） - * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠 8:健康包 9:随访包） * @property int $is_enable 是否启用（0:否 1:是） * @property int $last_enable_method 最后开启方式（1:自己 2:后台） * @property int $work_num_day 每日接诊数量 diff --git a/app/Model/DoctorInquiryConfigService.php b/app/Model/DoctorInquiryConfigService.php index ae93cc1..a030b1d 100644 --- a/app/Model/DoctorInquiryConfigService.php +++ b/app/Model/DoctorInquiryConfigService.php @@ -12,11 +12,11 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $config_service_id 主键id * @property int $doctor_id 医生id * @property int $inquiry_type 接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药） - * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员） + * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠 8:健康包 9:随访包） * @property string $service_content 服务内容 * @property string $service_process 服务流程 * @property int $service_period 服务周期 - * @property int $service_rounds 服务回合数 + * @property int $service_rounds 服务回合数（0表示不限次） * @property \Carbon\Carbon $created_at 创建时间 * @property \Carbon\Carbon $updated_at 修改时间 */ diff --git a/app/Model/OrderInquiry.php b/app/Model/OrderInquiry.php index b28a5e5..df8bb4b 100644 --- a/app/Model/OrderInquiry.php +++ b/app/Model/OrderInquiry.php @@ -18,7 +18,7 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $doctor_id 医生id（未分配时为null） * @property int $family_id 家庭成员id（就诊用户） * @property int $inquiry_type 订单类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测） - * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠） + * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠 8:健康包 9:随访包） * @property int $inquiry_status 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） * @property int $is_delete 删除状态（0:否 1:是） * @property int $inquiry_refund_status 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常） @@ -48,8 +48,8 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $patient_age 患者年龄-就诊人 * @property \Carbon\Carbon $created_at 创建时间 * @property \Carbon\Carbon $updated_at 修改时间 - * @property-read OrderInquiryCase|null $OrderInquiryCase * @property-read UserDoctor|null $UserDoctor + * @property-read OrderInquiryCase|null $OrderInquiryCase */ class OrderInquiry extends Model { diff --git a/app/Model/SystemInquiryConfig.php b/app/Model/SystemInquiryConfig.php index 5b69a1d..ebb9b01 100644 --- a/app/Model/SystemInquiryConfig.php +++ b/app/Model/SystemInquiryConfig.php @@ -12,7 +12,7 @@ use Hyperf\Snowflake\Concern\Snowflake; /** * @property string $system_inquiry_config_id 主键id * @property int $inquiry_type 接诊类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测） - * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠） + * @property int $inquiry_mode 接诊方式（1:图文 2:视频 3:语音 4:电话 5:会员 6:疑难会诊 7:附赠 8:健康包 9:随访包） * @property int $default_work_num_day 默认每日接诊数量 * @property int $max_work_num_day 每日最大接诊数量 * @property string $inquiry_price 接诊价格 diff --git a/config/autoload/logger.php b/config/autoload/logger.php index 65047df..c2f815c 100644 --- a/config/autoload/logger.php +++ b/config/autoload/logger.php @@ -43,9 +43,9 @@ if ($appEnv == 'dev') { return [ 'default' => [ 'handler' => [ - 'class' => Monolog\Handler\StreamHandler::class, + 'class' => Monolog\Handler\RotatingFileHandler::class, 'constructor' => [ - 'stream' => BASE_PATH . '/runtime/logs/hospital-applets-api.log', + 'filename' => BASE_PATH . '/runtime/logs/hospital-applets-api.log', 'level' => Monolog\Logger::INFO, ], ], From 7f4dc5a78c57229dc7ca20c44fd13bbe4fdc6a57 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Fri, 29 Mar 2024 18:58:54 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/DoctorAuthService.php | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 097072d..11d0264 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -1051,22 +1051,49 @@ class DoctorAuthService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "审核中，暂不允许修改"); } + $avatar = $doctor['avatar']; + $brief_introduction = $doctor['brief_introduction']; + $be_good_at = $doctor['be_good_at']; + + if ($doctor['introduction_status'] == 3){ + // 获取个人简介修改记录 + $params = array(); + $params['doctor_id'] = $doctor['doctor_id']; + $doctor_introduction_record = DoctorIntroductionRecord::getOne($params); + if (empty($doctor_introduction_record)){ + return fail(HttpEnumCode::HTTP_ERROR, "提交失败"); + } + + if (!empty($doctor_introduction_record['avatar'])){ + $avatar = $doctor_introduction_record['avatar']; + } + + if (!empty($doctor_introduction_record['brief_introduction'])){ + $brief_introduction = $doctor_introduction_record['brief_introduction']; + } + + if (!empty($doctor_introduction_record['be_good_at'])){ + $be_good_at = $doctor_introduction_record['be_good_at']; + } + } + + // 组合存储数据 $doctor_introduction_record_data = array(); // 头像 $request_params['avatar'] = PcreMatch::pregRemoveOssWebsite($request_params['avatar']); - if ($doctor['avatar'] != $request_params['avatar']) { + if ($avatar != $request_params['avatar']) { $doctor_introduction_record_data['avatar'] = $request_params['avatar']; } // 医生简介 - if ($doctor['brief_introduction'] != $request_params['brief_introduction']) { + if ($brief_introduction != $request_params['brief_introduction']) { $doctor_introduction_record_data['brief_introduction'] = $request_params['brief_introduction']; } // 擅长领域 - if ($doctor['be_good_at'] != $request_params['be_good_at']) { + if ($be_good_at != $request_params['be_good_at']) { $doctor_introduction_record_data['be_good_at'] = $request_params['be_good_at']; } From 2729e33506b1e1f51363f0baa4cc89ecf6e481e5 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Fri, 29 Mar 2024 19:08:25 +0800 Subject: [PATCH 28/28] 1 --- app/Services/DoctorAuthService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 11d0264..c83f6ae 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -1140,21 +1140,21 @@ class DoctorAuthService extends BaseService foreach ($doctor_iden_fails as $doctor_iden_fail){ // 头像 if ($doctor_iden_fail['field_name'] == "avatar") { - if ($doctor['avatar'] == $request_params['avatar']){ + if ($avatar == $request_params['avatar']){ return fail(HttpEnumCode::HTTP_ERROR,"医生头像" . $doctor_iden_fail['fail_reason']); } } // 医生简介 if ($doctor_iden_fail['field_name'] == "brief_introduction") { - if ($doctor['brief_introduction'] == $request_params['brief_introduction']){ + if ($brief_introduction == $request_params['brief_introduction']){ return fail(HttpEnumCode::HTTP_ERROR,"医生简介" . $doctor_iden_fail['fail_reason']); } } // 擅长领域 if ($doctor_iden_fail['field_name'] == "be_good_at") { - if ($doctor['be_good_at'] == $request_params['be_good_at']){ + if ($be_good_at == $request_params['be_good_at']){ return fail(HttpEnumCode::HTTP_ERROR,"擅长领域" . $doctor_iden_fail['fail_reason']); } }