diff --git a/SQL01-数据表结构.sql b/SQL01-数据表结构.sql index 51f3c3096..c555ac31e 100644 --- a/SQL01-数据表结构.sql +++ b/SQL01-数据表结构.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 26/03/2021 18:33:53 + Date: 27/03/2021 14:30:02 */ SET NAMES utf8mb4; @@ -380,11 +380,11 @@ CREATE TABLE `data_user_payment` ( `payment_datatime` datetime NULL DEFAULT NULL COMMENT '支付时间', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_data_base_payment_record_order_no`(`order_no`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_code`(`payment_code`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_type`(`payment_type`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_trade`(`payment_trade`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_status`(`payment_status`) USING BTREE + INDEX `idx_data_user_payment_order_no`(`order_no`) USING BTREE, + INDEX `idx_data_user_payment_payment_code`(`payment_code`) USING BTREE, + INDEX `idx_data_user_payment_payment_type`(`payment_type`) USING BTREE, + INDEX `idx_data_user_payment_payment_trade`(`payment_trade`) USING BTREE, + INDEX `idx_data_user_payment_payment_status`(`payment_status`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-基础-支付' ROW_FORMAT = COMPACT; -- ---------------------------- @@ -615,8 +615,6 @@ CREATE TABLE `shop_order` ( `amount_reduct` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '随机减免金额', `amount_express` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '快递费用金额', `amount_discount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '折扣后的金额', - `rebate_amount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '参与返利金额', - `reward_balance` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '奖励账户余额', `payment_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '实际支付平台', `payment_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '实际通道编号', `payment_allow` varchar(999) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '允许支付通道', @@ -630,6 +628,8 @@ CREATE TABLE `shop_order` ( `number_goods` bigint(20) NULL DEFAULT 0 COMMENT '订单商品数量', `number_express` bigint(20) NULL DEFAULT 0 COMMENT '订单快递计数', `truck_type` tinyint(1) NULL DEFAULT 0 COMMENT '物流配送类型(0无需配送,1需要配送)', + `rebate_amount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '参与返利金额', + `reward_balance` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '奖励账户余额', `order_remark` varchar(999) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '订单用户备注', `cancel_status` tinyint(1) NULL DEFAULT 0 COMMENT '订单取消状态', `cancel_remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '订单取消描述', @@ -821,7 +821,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 = 158 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_queue @@ -850,7 +850,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 = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_user diff --git a/SQL02-数据初始化.sql b/SQL02-数据初始化.sql index e7b0800f4..35e7b8c07 100644 --- a/SQL02-数据初始化.sql +++ b/SQL02-数据初始化.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 26/03/2021 18:36:50 + Date: 27/03/2021 14:30:25 */ SET NAMES utf8mb4; @@ -3831,28 +3831,27 @@ INSERT INTO `system_menu` VALUES (65, 60, '关注回复配置', 'layui-icon layu INSERT INTO `system_menu` VALUES (66, 60, '默认回复配置', 'layui-icon layui-icon-util', '', 'wechat/keys/defaults', '', '_self', 0, 1, '2019-12-14 14:11:18'); INSERT INTO `system_menu` VALUES (67, 0, '控制台', '', '', '#', '', '_self', 300, 1, '2020-07-13 06:51:46'); INSERT INTO `system_menu` VALUES (68, 67, '数据管理', '', '', '#', '', '_self', 301, 1, '2020-07-13 06:51:54'); -INSERT INTO `system_menu` VALUES (70, 68, '文章内容管理', 'layui-icon layui-icon-template', '', 'data/news_item/index', '', '_self', 10, 1, '2020-07-13 06:52:26'); -INSERT INTO `system_menu` VALUES (71, 68, '轮播图片管理', 'layui-icon layui-icon-carousel', 'data/base_config/sliderhome', 'data/base_config/sliderhome', '', '_self', 30, 1, '2020-07-14 01:17:02'); +INSERT INTO `system_menu` VALUES (70, 68, '文章内容管理', 'layui-icon layui-icon-template', 'data/news.item/index', 'data/news.item/index', '', '_self', 10, 0, '2020-07-13 06:52:26'); +INSERT INTO `system_menu` VALUES (71, 68, '轮播图片管理', 'layui-icon layui-icon-carousel', 'data/base.config/sliderhome', 'data/base.config/sliderhome', '', '_self', 30, 1, '2020-07-14 01:17:02'); INSERT INTO `system_menu` VALUES (73, 67, '商城管理', '', '', '#', '', '_self', 303, 1, '2020-09-08 02:51:30'); -INSERT INTO `system_menu` VALUES (75, 73, '商品分类管理', 'layui-icon layui-icon-tabs', 'data/shop_goods_cate/index', 'data/shop_goods_cate/index', '', '_self', 70, 1, '2020-09-08 03:35:58'); -INSERT INTO `system_menu` VALUES (76, 73, '商品数据管理', 'layui-icon layui-icon-star', 'data/shop_goods/index', 'data/shop_goods/index', '', '_self', 90, 1, '2020-09-08 07:13:19'); -INSERT INTO `system_menu` VALUES (77, 90, '会员用户管理', 'layui-icon layui-icon-user', 'data/user/index', 'data/user/index', '', '_self', 900, 1, '2020-09-10 01:48:02'); -INSERT INTO `system_menu` VALUES (78, 73, '订单数据管理', 'layui-icon layui-icon-template', 'data/shop_order/index', 'data/shop_order/index', '', '_self', 60, 1, '2020-09-10 01:48:41'); -INSERT INTO `system_menu` VALUES (79, 73, '订单发货管理', 'layui-icon layui-icon-transfer', 'data/shop_order_send/index', 'data/shop_order_send/index', '', '_self', 50, 1, '2020-09-10 01:50:12'); -INSERT INTO `system_menu` VALUES (81, 73, '快递公司管理', 'layui-icon layui-icon-website', 'data/base_postage_company/index', 'data/base_postage_company/index', '', '_self', 0, 1, '2020-09-15 08:47:46'); -INSERT INTO `system_menu` VALUES (82, 73, '邮费模板管理', 'layui-icon layui-icon-template-1', 'data/base_postage_template/index', 'data/base_postage_template/index', '', '_self', 0, 1, '2020-09-15 09:14:46'); -INSERT INTO `system_menu` VALUES (83, 73, '配送区域管理', 'layui-icon layui-icon-location', 'data/base_postage_template/region', 'data/base_postage_template/region', '', '_self', 0, 1, '2020-09-17 09:13:35'); -INSERT INTO `system_menu` VALUES (84, 68, '微信小程序配置', 'layui-icon layui-icon-set', 'data/base_config/wxapp', 'data/base_config/wxapp', '', '_self', 5, 1, '2020-09-21 16:34:08'); -INSERT INTO `system_menu` VALUES (87, 68, '支付参数管理', 'layui-icon layui-icon-rmb', 'data/base_payment/index', 'data/base_payment/index', '', '_self', 6, 1, '2020-12-12 09:08:09'); -INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base_message/index', 'data/base_message/index', '', '_self', 6, 1, '2021-01-20 10:07:32'); -INSERT INTO `system_menu` VALUES (89, 90, '余额充值管理', 'layui-icon layui-icon-rmb', 'data/user_balance/index', 'data/user_balance/index', '', '_self', 800, 1, '2021-01-20 10:09:49'); +INSERT INTO `system_menu` VALUES (75, 73, '商品分类管理', 'layui-icon layui-icon-tabs', 'data/shop.cate/index', 'data/shop.cate/index', '', '_self', 70, 1, '2020-09-08 03:35:58'); +INSERT INTO `system_menu` VALUES (76, 73, '商品数据管理', 'layui-icon layui-icon-star', 'data/shop.goods/index', 'data/shop.goods/index', '', '_self', 90, 1, '2020-09-08 07:13:19'); +INSERT INTO `system_menu` VALUES (77, 90, '会员用户管理', 'layui-icon layui-icon-user', 'data/user.admin/index', 'data/user.admin/index', '', '_self', 900, 1, '2020-09-10 01:48:02'); +INSERT INTO `system_menu` VALUES (78, 73, '订单数据管理', 'layui-icon layui-icon-template', 'data/shop.order/index', 'data/shop.order/index', '', '_self', 60, 1, '2020-09-10 01:48:41'); +INSERT INTO `system_menu` VALUES (79, 73, '订单发货管理', 'layui-icon layui-icon-transfer', 'data/shop.send/index', 'data/shop.send/index', '', '_self', 50, 1, '2020-09-10 01:50:12'); +INSERT INTO `system_menu` VALUES (81, 73, '快递公司管理', 'layui-icon layui-icon-website', 'data/base.postage.company/index', 'data/base.postage.company/index', '', '_self', 0, 1, '2020-09-15 08:47:46'); +INSERT INTO `system_menu` VALUES (82, 73, '邮费模板管理', 'layui-icon layui-icon-template-1', 'data/base.postage.template/index', 'data/base.postage.template/index', '', '_self', 0, 1, '2020-09-15 09:14:46'); +INSERT INTO `system_menu` VALUES (84, 68, '微信小程序配置', 'layui-icon layui-icon-set', 'data/base.config/wxapp', 'data/base.config/wxapp', '', '_self', 5, 1, '2020-09-21 16:34:08'); +INSERT INTO `system_menu` VALUES (87, 68, '支付参数管理', 'layui-icon layui-icon-rmb', 'data/base.payment/index', 'data/base.payment/index', '', '_self', 6, 1, '2020-12-12 09:08:09'); +INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base.message/index', 'data/base.message/index', '', '_self', 6, 1, '2021-01-20 10:07:32'); +INSERT INTO `system_menu` VALUES (89, 90, '余额充值管理', 'layui-icon layui-icon-rmb', 'data/user.balance/index', 'data/user.balance/index', '', '_self', 800, 1, '2021-01-20 10:09:49'); INSERT INTO `system_menu` VALUES (90, 67, '用户管理', '', '', '#', '', '_self', 302, 1, '2021-01-22 05:43:01'); -INSERT INTO `system_menu` VALUES (91, 90, '用户等级管理', 'layui-icon layui-icon-senior', 'data/base_upgrade/index', 'data/base_upgrade/index', '', '_self', 300, 1, '2021-01-22 05:43:27'); -INSERT INTO `system_menu` VALUES (92, 90, '用户折扣方案', 'layui-icon layui-icon-set', 'data/base_discount/index', 'data/base_discount/index', '', '_self', 200, 1, '2021-01-27 05:44:51'); -INSERT INTO `system_menu` VALUES (93, 90, '用户提现管理', 'layui-icon layui-icon-component', 'data/user_transfer/index', 'data/user_transfer/index', '', '_self', 500, 1, '2021-01-28 06:48:34'); -INSERT INTO `system_menu` VALUES (94, 68, '页面内容管理', 'layui-icon layui-icon-read', 'data/base_config/pagehome', 'data/base_config/pagehome', '', '_self', 20, 1, '2021-02-24 08:49:16'); -INSERT INTO `system_menu` VALUES (95, 68, '邀请二维码设置', 'layui-icon layui-icon-cols', 'data/config/cropper', 'data/base_config/cropper', '', '_self', 0, 1, '2021-03-01 09:53:59'); -INSERT INTO `system_menu` VALUES (97, 90, '用户返利管理', 'layui-icon layui-icon-transfer', 'data/user_rebate/index', 'data/user_rebate/index', '', '_self', 600, 1, '2021-03-12 10:06:49'); +INSERT INTO `system_menu` VALUES (91, 90, '用户等级管理', 'layui-icon layui-icon-senior', 'data/base.upgrade/index', 'data/base.upgrade/index', '', '_self', 300, 1, '2021-01-22 05:43:27'); +INSERT INTO `system_menu` VALUES (92, 90, '用户折扣方案', 'layui-icon layui-icon-set', 'data/base.discount/index', 'data/base.discount/index', '', '_self', 200, 1, '2021-01-27 05:44:51'); +INSERT INTO `system_menu` VALUES (93, 90, '用户提现管理', 'layui-icon layui-icon-component', 'data/user.transfer/index', 'data/user.transfer/index', '', '_self', 500, 1, '2021-01-28 06:48:34'); +INSERT INTO `system_menu` VALUES (94, 68, '页面内容管理', 'layui-icon layui-icon-read', 'data/base.config/pagehome', 'data/base.config/pagehome', '', '_self', 20, 0, '2021-02-24 08:49:16'); +INSERT INTO `system_menu` VALUES (95, 68, '邀请二维码设置', 'layui-icon layui-icon-cols', 'data/base.config/cropper', 'data/base.config/cropper', '', '_self', 0, 1, '2021-03-01 09:53:59'); +INSERT INTO `system_menu` VALUES (97, 90, '用户返利管理', 'layui-icon layui-icon-transfer', 'data/user.rebate/index', 'data/user.rebate/index', '', '_self', 600, 1, '2021-03-12 10:06:49'); -- ---------------------------- -- Table structure for system_user @@ -3885,6 +3884,6 @@ CREATE TABLE `system_user` ( -- ---------------------------- -- Records of system_user -- ---------------------------- -INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '系统管理员', 'https://xhtwxapp.cdn.xiaoding.shop/cf/23526f451784ff137f161b8fe18d5a.png', ',,', '', '', '', '61.140.234.218', '2021-03-26 18:20:44', 139, '', 1, 0, 0, '2015-11-13 15:14:22'); +INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '系统管理员', 'https://xhtwxapp.cdn.xiaoding.shop/cf/23526f451784ff137f161b8fe18d5a.png', ',,', '', '', '', '127.0.0.1', '2021-03-27 13:55:45', 140, '', 1, 0, 0, '2015-11-13 15:14:22'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/app/data/controller/ShopOrderService.php b/app/data/controller/ShopOrderService.php deleted file mode 100644 index 28f9293b4..000000000 --- a/app/data/controller/ShopOrderService.php +++ /dev/null @@ -1,40 +0,0 @@ -title = '售后申请管理'; - $this->type = input('type', 'all'); - - $query = $this->_query($this->table); - if (is_numeric($this->type = input('type', 'all'))) { - $query->equal('status#type'); - } - $query->order('id desc')->page(); - } - -} \ No newline at end of file diff --git a/app/data/controller/BaseConfig.php b/app/data/controller/base/Config.php similarity index 97% rename from app/data/controller/BaseConfig.php rename to app/data/controller/base/Config.php index 3e775fa53..708fc4cbf 100644 --- a/app/data/controller/BaseConfig.php +++ b/app/data/controller/base/Config.php @@ -1,15 +1,15 @@ company(); diff --git a/app/data/controller/BasePostageTemplate.php b/app/data/controller/base/postage/Template.php similarity index 96% rename from app/data/controller/BasePostageTemplate.php rename to app/data/controller/base/postage/Template.php index 09105bd12..7c1d21d29 100644 --- a/app/data/controller/BasePostageTemplate.php +++ b/app/data/controller/base/postage/Template.php @@ -1,6 +1,6 @@ 跳转规则 - 选择文章 - 选择商品 + 选择文章 + 选择商品 若要跳转页面,请选择对应的数据或填写跳转的 URL 地址,不跳转请填写 “#” 号占位。 diff --git a/app/data/view/base_config/wxapp.html b/app/data/view/base/config/wxapp.html similarity index 100% rename from app/data/view/base_config/wxapp.html rename to app/data/view/base/config/wxapp.html diff --git a/app/data/view/base_discount/form.html b/app/data/view/base/discount/form.html similarity index 100% rename from app/data/view/base_discount/form.html rename to app/data/view/base/discount/form.html diff --git a/app/data/view/base_discount/index.html b/app/data/view/base/discount/index.html similarity index 100% rename from app/data/view/base_discount/index.html rename to app/data/view/base/discount/index.html diff --git a/app/data/view/base_message/form.html b/app/data/view/base/message/form.html similarity index 100% rename from app/data/view/base_message/form.html rename to app/data/view/base/message/form.html diff --git a/app/data/view/base_message/index.html b/app/data/view/base/message/index.html similarity index 98% rename from app/data/view/base_message/index.html rename to app/data/view/base/message/index.html index 89eee05da..d5b7b9335 100644 --- a/app/data/view/base_message/index.html +++ b/app/data/view/base/message/index.html @@ -13,7 +13,7 @@ {block name='content'}
- - | -用户信息 | -订单信息 | -发货信息 | -商品信息 | -
---|---|---|---|---|
- - | -
-
-
- ![]()
- 推荐用户:{$vo.from.nickname|default='--'}
- - 推荐手机:{$vo.from.phone|default='--'}{notempty name='vo.from.vip_level'} [ VIP{$vo.from.vip_level} ] {$vo.from.vip_title}{/notempty} -
-
- ![]()
- 用户昵称:{$vo.member.nickname|default='--'}
- - 用户手机:{$vo.member.phone|default='--'}{notempty name='vo.member.vip_level'} [ VIP{$vo.member.vip_level} ] {$vo.member.vip_title}{/notempty} - |
-
-
- {eq name='vo.status' value='0'}已取消{/eq}
- {eq name='vo.status' value='1'}预订单{/eq}
- {eq name='vo.status' value='2'}待付款{/eq}
- {eq name='vo.status' value='3'}待发货{/eq}
- {eq name='vo.status' value='4'}已发货{/eq}
- {eq name='vo.status' value='5'}已完成{/eq}
-
-
- 订单单号:{$vo.order_no|default=''}
- - 订单金额:{$vo.price_total+0} 元{if $vo.price_express>0}(含{$vo.price_express+0}元){else}(包邮){/if}已支付 {$vo.pay_price+0} 元 - 下单时间:{$vo.create_at|format_datetime} - 支付时间:{$vo.pay_datetime|format_datetime}{if $vo.pay_datetime} ({$vo.pay_type|default='-'}){/if} - |
-
- 收货信息:{$vo.express_name|default='--'}{$vo.express_phone} - 收货地址:{$vo.express_province|default='--'}{$vo.express_city}{$vo.express_area}{$vo.express_address} - 发货状态:{eq name='vo.express_state' value='0'} - 未发货 - {else} - {$vo.express_company_title|default='--'} - {$vo.express_send_no|default='--'} - {/eq} - {if $vo.status eq 3} - 填写发货 - - 提交仓库 - - - 取消并退款 - - {elseif $vo.status eq 4} - 修改发货 - {/if} - - 发货时间:{$vo.express_send_at|format_datetime} - |
-
- {foreach $vo.list as $g}
-
- {if $g.vip_mod > 0 and $g.vip_level > $g.discount_vip}
- [ VIP{$g.discount_vip} VIP{$g.vip_level} ]
- {else}
- [ VIP{$g.discount_vip} ]
- {/if}
- {if $g.discount_rate<100.00}
- 享{$g.discount_rate+0}%折扣
- x
- {/if}
- {$g.number_goods|default=0}件
- x
- {$g.goods_price_market+0}元
- {$g.goods_title|default=''} ( {$g.goods_spec|show_goods_spec})
-
- {/foreach}
- |
-