From faf5618f91cc52a94904457021fa77850b94a9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Fri, 26 Mar 2021 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQL01-数据表结构.sql | 36 +++++++++++++----------- app/data/controller/api/auth/Address.php | 4 ++- app/data/controller/api/auth/Order.php | 2 ++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/SQL01-数据表结构.sql b/SQL01-数据表结构.sql index 76897543e..4bc383fa6 100644 --- a/SQL01-数据表结构.sql +++ b/SQL01-数据表结构.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 23/03/2021 18:25:46 + Date: 26/03/2021 15:18:31 */ SET NAMES utf8mb4; @@ -139,7 +139,7 @@ CREATE TABLE `data_user` ( INDEX `idx_data_user_openid1`(`openid1`) USING BTREE, INDEX `idx_data_user_openid2`(`openid2`) USING BTREE, INDEX `idx_data_user_unionid`(`unionid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-会员' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-会员' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_user_address @@ -153,6 +153,8 @@ CREATE TABLE `data_user_address` ( `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '收货姓名', `phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '收货手机', `idcode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '身体证号', + `idimg1` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '身份证正面', + `idimg2` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '身份证反面', `province` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '地址-省份', `city` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '地址-城市', `area` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '地址-区域', @@ -185,7 +187,7 @@ CREATE TABLE `data_user_balance` ( INDEX `idx_data_user_balance_uid`(`uid`) USING BTREE, INDEX `idx_data_user_balance_code`(`code`) USING BTREE, INDEX `idx_data_user_balance_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 62 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-余额' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-余额' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_user_discount @@ -270,7 +272,7 @@ CREATE TABLE `data_user_rebate` ( INDEX `idx_data_user_rebate_code`(`code`) USING BTREE, INDEX `idx_data_user_rebate_name`(`name`) USING BTREE, INDEX `idx_data_user_rebate_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据-用户-返利' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 53 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据-用户-返利' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for data_user_token @@ -288,7 +290,7 @@ CREATE TABLE `data_user_token` ( INDEX `idx_data_user_token_type`(`type`) USING BTREE, INDEX `idx_data_user_token_time`(`time`) USING BTREE, INDEX `idx_data_user_token_token`(`token`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 163 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-认证' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-用户-认证' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for data_user_transfer @@ -332,7 +334,7 @@ CREATE TABLE `data_user_transfer` ( INDEX `idx_data_user_transfer_appid`(`appid`) USING BTREE, INDEX `idx_data_user_transfer_openid`(`openid`) USING BTREE, INDEX `idx_data_user_transfer_audit_status`(`audit_status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据-用户-提现' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据-用户-提现' ROW_FORMAT = Compact; -- ---------------------------- -- Table structure for data_user_upgrade @@ -404,7 +406,7 @@ CREATE TABLE `shop_goods` ( INDEX `idx_shop_goods_cate`(`cateids`(191)) USING BTREE, INDEX `idx_shop_goods_status`(`status`) USING BTREE, INDEX `idx_shop_goods_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_goods_cate @@ -449,7 +451,7 @@ CREATE TABLE `shop_goods_item` ( INDEX `index_store_goods_item_code`(`goods_code`) USING BTREE, INDEX `index_store_goods_item_spec`(`goods_spec`) USING BTREE, INDEX `index_store_goods_item_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_goods_mark @@ -483,7 +485,7 @@ CREATE TABLE `shop_goods_stock` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_shop_goods_stock_status`(`status`) USING BTREE, INDEX `idx_shop_goods_stock_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-库存' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-库存' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_order @@ -533,7 +535,7 @@ CREATE TABLE `shop_order` ( INDEX `idx_shop_order_orderno`(`order_no`) USING BTREE, INDEX `idx_shop_order_cancel_status`(`cancel_status`) USING BTREE, INDEX `idx_shop_order_payment_status`(`payment_status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 99 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-内容' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_order_item @@ -579,7 +581,7 @@ CREATE TABLE `shop_order_item` ( INDEX `idx_shop_order_item_goods_code`(`goods_code`) USING BTREE, INDEX `idx_shop_order_item_goods_spec`(`goods_spec`) USING BTREE, INDEX `idx_shop_order_item_rebate_type`(`rebate_type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 99 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-订单-商品' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_order_send @@ -592,7 +594,9 @@ CREATE TABLE `shop_order_send` ( `address_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送地址编号', `address_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人姓名', `address_phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人手机', - `address_idcode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人证件', + `address_idcode` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人证件号码', + `address_idimg1` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人证件正面', + `address_idimg2` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送收货人证件反面', `address_province` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送地址的省份', `address_city` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送地址的城市', `address_area` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '配送地址的区域', @@ -615,7 +619,7 @@ CREATE TABLE `shop_order_send` ( INDEX `idx_shop_order_send_status`(`status`) USING BTREE, INDEX `idx_shop_order_send_deleted`(`deleted`) USING BTREE, INDEX `idx_shop_order_send_order_no`(`order_no`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 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 shop_payment @@ -662,7 +666,7 @@ CREATE TABLE `shop_payment_item` ( INDEX `idx_shop_payment_item_payment_type`(`payment_type`) USING BTREE, INDEX `idx_shop_payment_item_payment_trade`(`payment_trade`) USING BTREE, INDEX `idx_shop_payment_item_payment_status`(`payment_status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 71 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-支付-记录' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-支付-记录' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for shop_truck_company @@ -813,7 +817,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 = 98 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 127 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_queue @@ -842,7 +846,7 @@ CREATE TABLE `system_queue` ( INDEX `idx_system_queue_rscript`(`rscript`) USING BTREE, INDEX `idx_system_queue_create_at`(`create_at`) USING BTREE, INDEX `idx_system_queue_exec_time`(`exec_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_user diff --git a/app/data/controller/api/auth/Address.php b/app/data/controller/api/auth/Address.php index 21cbeb130..e9a8f4db8 100644 --- a/app/data/controller/api/auth/Address.php +++ b/app/data/controller/api/auth/Address.php @@ -28,7 +28,9 @@ class Address extends Auth 'uid.value' => $this->uuid, 'type.default' => 0, 'code.default' => '', - 'idcode.default' => '', + 'idcode.default' => '', // 身份证号码 + 'idimg1.default' => '', // 身份证正面 + 'idimg2.default' => '', // 身份证反面 'type.in:0,1' => '地址状态不在范围！', 'name.require' => '收货姓名不能为空！', 'phone.mobile' => '收货手机格式错误！', diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index 704dc56d4..b4382519f 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -260,6 +260,8 @@ class Order extends Auth $express['address_name'] = $addr['name']; $express['address_phone'] = $addr['phone']; $express['address_idcode'] = $addr['idcode']; + $express['address_idimg1'] = $addr['idimg1']; + $express['address_idimg2'] = $addr['idimg2']; $express['address_province'] = $addr['province']; $express['address_city'] = $addr['city']; $express['address_area'] = $addr['area'];