diff --git a/SQL01-数据表结构.sql b/SQL01-数据表结构.sql index f1a896255..76897543e 100644 --- a/SQL01-数据表结构.sql +++ b/SQL01-数据表结构.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 23/03/2021 14:35:38 + Date: 23/03/2021 18:25:46 */ SET NAMES utf8mb4; @@ -160,10 +160,10 @@ CREATE TABLE `data_user_address` ( `deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_data_user_address_uid`(`uid`) USING BTREE, INDEX `idx_data_user_address_type`(`type`) USING BTREE, INDEX `idx_data_user_address_code`(`code`) USING BTREE, - INDEX `idx_data_user_address_deleted`(`deleted`) USING BTREE, - INDEX `idx_data_user_address_uid`(`uid`) USING BTREE + INDEX `idx_data_user_address_deleted`(`deleted`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-地址' ROW_FORMAT = COMPACT; -- ---------------------------- @@ -766,7 +766,7 @@ CREATE TABLE `system_config` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_system_config_type`(`type`) USING BTREE, INDEX `idx_system_config_name`(`name`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 27 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_data @@ -813,7 +813,7 @@ CREATE TABLE `system_oplog` ( `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '操作人用户名', `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 94 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 98 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_queue diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 0b7fba70e..573d338a0 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -180,6 +180,7 @@ return array( 'WePayV3\\Refund' => $vendorDir . '/zoujingli/wechat-developer/WePayV3/Refund.php', 'WePay\\Bill' => $vendorDir . '/zoujingli/wechat-developer/WePay/Bill.php', 'WePay\\Coupon' => $vendorDir . '/zoujingli/wechat-developer/WePay/Coupon.php', + 'WePay\\Custom' => $vendorDir . '/zoujingli/wechat-developer/WePay/Custom.php', 'WePay\\Order' => $vendorDir . '/zoujingli/wechat-developer/WePay/Order.php', 'WePay\\Redpack' => $vendorDir . '/zoujingli/wechat-developer/WePay/Redpack.php', 'WePay\\Refund' => $vendorDir . '/zoujingli/wechat-developer/WePay/Refund.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 451f9a6fc..d197e3127 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -309,6 +309,7 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53 'WePayV3\\Refund' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePayV3/Refund.php', 'WePay\\Bill' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Bill.php', 'WePay\\Coupon' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Coupon.php', + 'WePay\\Custom' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Custom.php', 'WePay\\Order' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Order.php', 'WePay\\Redpack' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Redpack.php', 'WePay\\Refund' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WePay/Refund.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f09a9d646..d1e4cbe87 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -780,17 +780,17 @@ }, { "name": "zoujingli/ip2region", - "version": "v1.0.9", - "version_normalized": "1.0.9.0", + "version": "v1.0.10", + "version_normalized": "1.0.10.0", "source": { "type": "git", "url": "https://github.com/zoujingli/ip2region.git", - "reference": "e48f9122f50dd3b79295e35b4acdd0dcd2608ca8" + "reference": "453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/e48f9122f50dd3b79295e35b4acdd0dcd2608ca8", - "reference": "e48f9122f50dd3b79295e35b4acdd0dcd2608ca8", + "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0", + "reference": "453480d0ab5b6fdbdf4aa400b7598a10ff2dc5c0", "shasum": "", "mirrors": [ { @@ -802,7 +802,7 @@ "require": { "php": ">=5.3" }, - "time": "2020-11-06T07:21:55+00:00", + "time": "2021-03-23T10:29:05+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -889,17 +889,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.28", - "version_normalized": "1.2.28.0", + "version": "v1.2.29", + "version_normalized": "1.2.29.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "463c677cfdf8a3f3b21264babca034edb9fc7c3c" + "reference": "0b086a29d799ac1c7e04fedddd5ea38e4a885657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/463c677cfdf8a3f3b21264babca034edb9fc7c3c", - "reference": "463c677cfdf8a3f3b21264babca034edb9fc7c3c", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/0b086a29d799ac1c7e04fedddd5ea38e4a885657", + "reference": "0b086a29d799ac1c7e04fedddd5ea38e4a885657", "shasum": "", "mirrors": [ { @@ -919,7 +919,7 @@ "ext-xml": "*", "php": ">=5.4" }, - "time": "2021-03-09T10:04:53+00:00", + "time": "2021-03-23T10:12:26+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/services.php b/vendor/services.php index d97a9f836..845856bea 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/ip2region/ip2region.db b/vendor/zoujingli/ip2region/ip2region.db index b688511f7..3b6a296ee 100644 Binary files a/vendor/zoujingli/ip2region/ip2region.db and b/vendor/zoujingli/ip2region/ip2region.db differ diff --git a/vendor/zoujingli/wechat-developer/We.php b/vendor/zoujingli/wechat-developer/We.php index 1e2fb2b79..1fdfe2fe5 100644 --- a/vendor/zoujingli/wechat-developer/We.php +++ b/vendor/zoujingli/wechat-developer/We.php @@ -74,8 +74,9 @@ use WeChat\Exceptions\InvalidInstanceException; * * ----- WePay ----- * @method \WePay\Bill WePayBill($options = []) static 微信商户账单及评论 - * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券 * @method \WePay\Order WePayOrder($options = []) static 微信商户订单 + * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券 + * @method \WePay\Custom WePayCustom($options = []) static 微信商户海关 * @method \WePay\Refund WePayRefund($options = []) static 微信商户退款 * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持 * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱 @@ -87,7 +88,7 @@ class We * 定义当前版本 * @var string */ - const VERSION = '1.2.28'; + const VERSION = '1.2.29'; /** * 静态配置 diff --git a/vendor/zoujingli/wechat-developer/WePay/Custom.php b/vendor/zoujingli/wechat-developer/WePay/Custom.php new file mode 100644 index 000000000..2171ea4ae --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WePay/Custom.php @@ -0,0 +1,55 @@ +callPostApi($url, $options, false, 'MD5'); + } + + /** + * 订单附加信息查询接口 + * @param array $options + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function get(array $options = []) + { + $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/customs/customdeclarequery'; + return $this->callPostApi($url, $options, false, 'MD5'); + } + + + /** + * 订单附加信息重推接口 + * @param array $options + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function reset(array $options = []) + { + $url = 'https://api.mch.weixin.qq.com/cgi-bin/mch/newcustoms/customdeclareredeclare'; + return $this->callPostApi($url, $options, false, 'MD5'); + } + +} \ No newline at end of file