ComposerUpdate

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

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;

app/data/controller/ShopOrderService.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace app\data\controller;
-
-use think\admin\Controller;
-
-/**
- * 售后申请管理
- * Class ShopOrderService
- * @package app\data\controller
- */
-class ShopOrderService extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'ShopOrderService';
-
-    /**
-     * 售后申请管理
-     * @auth true
-     * @menu true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function index()
-    {
-        $this->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();
-    }
-
-}

app/data/controller/BaseConfig.php → app/data/controller/base/Config.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base;
 
 use think\admin\Controller;
 
 /**
  * 应用参数配置
- * Class BaseConfig
- * @package app\data\controller
+ * Class Config
+ * @package app\data\controller\base
  */
-class BaseConfig extends Controller
+class Config extends Controller
 {
     /**
      * 页面类型

app/data/controller/BaseDiscount.php → app/data/controller/base/Discount.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base;
 
 use app\data\service\UserUpgradeService;
 use think\admin\Controller;
 
 /**
  * 折扣方案管理
- * Class BaseDiscount
- * @package app\data\controller
+ * Class Discount
+ * @package app\data\controller\base
  */
-class BaseDiscount extends Controller
+class Discount extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/BaseMessage.php → app/data/controller/base/Message.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base;
 
 use think\admin\Controller;
 
 /**
  * 系统通知管理
- * Class BaseMessage
- * @package app\data\controller
+ * Class Message
+ * @package app\data\controller\base
  */
-class BaseMessage extends Controller
+class Message extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/BasePayment.php → app/data/controller/base/Payment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base;
 
 use app\data\service\PaymentService;
 use app\data\service\UserAdminService;
@@ -9,10 +9,10 @@ use think\admin\extend\CodeExtend;
 
 /**
  * 支付通道管理
- * Class BasePayment
- * @package app\data\controller
+ * Class Payment
+ * @package app\data\controller\base
  */
-class BasePayment extends Controller
+class Payment extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/BaseUpgrade.php → app/data/controller/base/Upgrade.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base;
 
 use app\data\service\RebateService;
 use think\admin\Controller;
 
 /**
  * 用户等级管理
- * Class BaseUpgrade
- * @package app\data\controller
+ * Class Upgrade
+ * @package app\data\controller\base
  */
-class BaseUpgrade extends Controller
+class Upgrade extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/BasePostageCompany.php → app/data/controller/base/postage/Company.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base\postage;
 
 use app\data\service\ExpressService;
 use think\admin\Controller;
@@ -9,10 +9,10 @@ use think\exception\HttpResponseException;
 
 /**
  * 快递公司管理
- * Class BasePostageCompany
- * @package app\data\controller
+ * Class Company
+ * @package app\data\controller\base\postage
  */
-class BasePostageCompany extends Controller
+class Company extends Controller
 {
     /**
      * 绑定数据表
@@ -94,7 +94,7 @@ class BasePostageCompany extends Controller
      * 同步快递公司
      * @auth true
      */
-    public function synchronize()
+    public function sync()
     {
         try {
             $result = ExpressService::instance()->company();

app/data/controller/BasePostageTemplate.php → app/data/controller/base/postage/Template.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\base\postage;
 
 use app\data\service\ExpressService;
 use think\admin\Controller;
@@ -8,10 +8,10 @@ use think\admin\extend\CodeExtend;
 
 /**
  * 邮费模板管理
- * Class BasePostageTemplate
- * @package app\data\controller
+ * Class Template
+ * @package app\data\controller\base\postage
  */
-class BasePostageTemplate extends Controller
+class Template extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/NewsItem.php → app/data/controller/news/Item.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\news;
 
 use app\data\service\NewsService;
 use think\admin\Controller;
@@ -8,10 +8,10 @@ use think\admin\extend\CodeExtend;
 
 /**
  * 文章内容管理
- * Class NewsItem
- * @package app\data\controller
+ * Class Item
+ * @package app\data\controller\news
  */
-class NewsItem extends Controller
+class Item extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/NewsMark.php → app/data/controller/news/Mark.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\news;
 
 use think\admin\Controller;
 
 /**
  * 文章标签管理
- * Class NewsMark
- * @package app\data\controller
+ * Class Mark
+ * @package app\data\controller\news
  */
-class NewsMark extends Controller
+class Mark extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/ShopGoodsCate.php → app/data/controller/shop/Cate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\shop;
 
 use app\data\service\GoodsService;
 use think\admin\Controller;
@@ -8,10 +8,10 @@ use think\admin\extend\DataExtend;
 
 /**
  * 商品分类管理
- * Class ShopGoodsCate
- * @package app\data\controller
+ * Class Cate
+ * @package app\data\controller\shop
  */
-class ShopGoodsCate extends Controller
+class Cate extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/ShopGoods.php → app/data/controller/shop/Goods.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\shop;
 
 use app\data\service\ExpressService;
 use app\data\service\GoodsService;
@@ -10,10 +10,10 @@ use think\admin\extend\CodeExtend;
 
 /**
  * 商品数据管理
- * Class ShopGoods
- * @package app\data\controller
+ * Class Goods
+ * @package app\data\controller\shop
  */
-class ShopGoods extends Controller
+class Goods extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/ShopGoodsMark.php → app/data/controller/shop/Mark.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\shop;
 
 use think\admin\Controller;
 
 /**
  * 商品标签管理
- * Class ShopGoodsMark
- * @package app\data\controller
+ * Class Mark
+ * @package app\data\controller\shop
  */
-class ShopGoodsMark extends Controller
+class Mark extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/ShopOrder.php → app/data/controller/shop/Order.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\shop;
 
 use app\data\service\ExpressService;
 use app\data\service\OrderService;
@@ -12,10 +12,10 @@ use think\exception\HttpResponseException;
 
 /**
  * 订单数据管理
- * Class ShopOrder
- * @package app\data\controller
+ * Class Order
+ * @package app\data\controller\shop
  */
-class ShopOrder extends Controller
+class Order extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/ShopOrderSend.php → app/data/controller/shop/Send.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\shop;
 
 use app\data\service\OrderService;
 use think\admin\Controller;
 
 /**
  * 订单发货管理
- * Class ShopOrderSend
- * @package app\data\controller
+ * Class Send
+ * @package app\data\controller\shop
  */
-class ShopOrderSend extends Controller
+class Send extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/User.php → app/data/controller/user/Admin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\user;
 
 use app\data\service\UserAdminService;
 use app\data\service\UserUpgradeService;
@@ -8,10 +8,10 @@ use think\admin\Controller;
 
 /**
  * 普通用户管理
- * Class User
- * @package app\data\controller
+ * Class Admin
+ * @package app\data\controller\user
  */
-class User extends Controller
+class Admin extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/UserBalance.php → app/data/controller/user/Balance.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\user;
 
 use app\data\service\UserAdminService;
 use app\data\service\UserBalanceService;
@@ -11,10 +11,10 @@ use think\admin\service\AdminService;
 
 /**
  * 余额充值记录
- * Class UserBalance
- * @package app\data\controller
+ * Class Balance
+ * @package app\data\controller\user
  */
-class UserBalance extends Controller
+class Balance extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/UserMessage.php → app/data/controller/user/Message.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\user;
 
 use app\data\service\MessageService;
 use think\admin\Controller;
 
 /**
  * 短信发送管理
- * Class UserMessage
- * @package app\data\controller
+ * Class Message
+ * @package app\data\controller\user
  */
-class UserMessage extends Controller
+class Message extends Controller
 {
     /**
      * 绑定数据表

app/data/controller/UserRebate.php → app/data/controller/user/Rebate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\user;
 
 use app\data\service\RebateService;
 use app\data\service\UserRebateService;
@@ -9,10 +9,10 @@ use think\admin\Controller;
 
 /**
  * 用户返利管理
- * Class UserRebate
- * @package app\data\controller
+ * Class Rebate
+ * @package app\data\controller\user
  */
-class UserRebate extends Controller
+class Rebate extends Controller
 {
 
     /**

app/data/controller/UserTransfer.php → app/data/controller/user/Transfer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\data\controller;
+namespace app\data\controller\user;
 
 use app\data\service\UserAdminService;
 use app\data\service\UserTransferService;
@@ -10,10 +10,10 @@ use think\admin\service\AdminService;
 
 /**
  * 用户提现管理
- * Class UserTransfer
- * @package app\data\controller
+ * Class Transfer
+ * @package app\data\controller\user
  */
-class UserTransfer extends Controller
+class Transfer extends Controller
 {
     /**
      * 绑定数据表

app/data/view/base_config/slider.html → app/data/view/base/config/slider.html

@@ -35,8 +35,8 @@
         <label class="layui-input-inline nowrap relative margin-bottom-5" style="width:300px">
             <b class="notselect color-green margin-right-5">跳转规则</b>
             <input class="layui-input inline-block" name="rule[]" placeholder="请输入跳转规则" required style="width:240px" value="#">
-            <a class="layui-btn layui-btn-primary" data-prefix="NEWS" data-rule-page="{:url('data/news_item/select')}">选择文章</a>
-            <a class="layui-btn layui-btn-primary" data-prefix="GOODS" data-rule-page="{:url('data/shop_goods/select')}">选择商品</a>
+            <a class="layui-btn layui-btn-primary" data-prefix="NEWS" data-rule-page="{:url('data/news.item/select')}">选择文章</a>
+            <a class="layui-btn layui-btn-primary" data-prefix="GOODS" data-rule-page="{:url('data/shop.goods/select')}">选择商品</a>
             <span class="help-block block notselect">若要跳转页面，请选择对应的数据或填写跳转的 URL 地址，不跳转请填写 “#” 号占位。</span>
         </label>
     </div>

app/data/view/base_message/index.html → app/data/view/base/message/index.html

@@ -13,7 +13,7 @@
 
 {block name='content'}
 <div class="think-box-shadow">
-    {include file='base_message/index_search'}
+    {include file='base/message/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/base_payment/index.html → app/data/view/base/payment/index.html

@@ -12,7 +12,7 @@
 
 {block name='content'}
 <div class="think-box-shadow">
-    {include file='base_payment/index_search'}
+    {include file='base/payment/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/base_postage_company/index.html → app/data/view/base/postage/company/index.html

@@ -1,8 +1,8 @@
 {extend name="../../admin/view/main"}
 
 {block name="button"}
-<!--{if auth("synchronize") and $type eq 'index'}-->
-<button class='layui-btn layui-btn-sm layui-btn-primary' data-confirm="确定要同步快递公司数据吗？" data-load='{:url("synchronize")}'>同步公司</button>
+<!--{if auth("sync") and $type eq 'index'}-->
+<button class='layui-btn layui-btn-sm layui-btn-primary' data-confirm="确定要同步快递公司数据吗？" data-load='{:url("sync")}'>同步公司</button>
 <!--{/if}-->
 
 <!--{if auth("add") and $type eq 'index'}-->
@@ -33,7 +33,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        {include file='base_postage_company/index_search'}
+        {include file='base/postage/company/index_search'}
         <table class="layui-table" lay-skin="line">
             {notempty name='list'}
             <thead>

app/data/view/base_postage_template/index.html → app/data/view/base/postage/template/index.html

@@ -13,7 +13,7 @@
 {block name="content"}
 <div class="layui-tab layui-tab-card think-bg-white">
     <div class="layui-tab-content">
-        {include file='base_postage_template/index_search'}
+        {include file='base/postage/template/index_search'}
         <table class="layui-table" lay-skin="line">
             {notempty name='list'}
             <thead>

app/data/view/news_item/index.html → app/data/view/news/item/index.html

@@ -16,7 +16,7 @@
 
 {block name='content'}
 <div class="think-box-shadow">
-    {include file='news_item/index_search'}
+    {include file='news/item/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/news_item/select.html → app/data/view/news/item/select.html

@@ -2,7 +2,7 @@
 
 {block name='content'}
 <div class="iframe-pagination">
-    {include file='news_item/select_search'}
+    {include file='news/item/select_search'}
     <table class="layui-table" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/news_mark/index.html → app/data/view/news/mark/index.html

@@ -2,7 +2,7 @@
 
 {block name='content'}
 <div class="iframe-pagination">
-    {include file='news_mark/index_search'}
+    {include file='news/mark/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/shop_goods/index.html → app/data/view/shop/goods/index.html

@@ -31,7 +31,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        {include file='shop_goods/index_search'}
+        {include file='shop/goods/index_search'}
         <table class="layui-table margin-top-10" lay-skin="line">
             {notempty name='list'}
             <thead>

app/data/view/shop_goods/select.html → app/data/view/shop/goods/select.html

@@ -2,7 +2,7 @@
 
 {block name="content"}
 <div class="iframe-pagination">
-    {include file='shop_goods/select_search'}
+    {include file='shop/goods/select_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/shop_goods_mark/index.html → app/data/view/shop/mark/index.html

@@ -2,7 +2,7 @@
 
 {block name='content'}
 <div class="iframe-pagination">
-    {include file='shop_goods_mark/index_search'}
+    {include file='shop/mark/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/shop_order/index.html → app/data/view/shop/order/index.html

@@ -17,7 +17,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        {include file='shop_order/index_search'}
+        {include file='shop/order/index_search'}
         <table class="layui-table margin-top-10" lay-skin="line">
             {notempty name='list'}
             <thead>

app/data/view/shop_order_send/index.html → app/data/view/shop/send/index.html

@@ -17,7 +17,7 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        {include file='shop_order_send/index_search'}
+        {include file='shop/send/index_search'}
         <table class="layui-table margin-top-10" lay-skin="line">
             {notempty name='list'}
             <thead>

app/data/view/shop_order_service/index.html

@@ -1,130 +0,0 @@
-{extend name="../../admin/view/main"}
-
-{block name="content"}
-<div class="layui-tab layui-tab-card think-bg-white">
-    <ul class="layui-tab-title notselect">
-        {foreach ['all'=>'全部订单','2'=>'待支付的订单','3'=>'待发货的订单','4'=>'待收货的订单','5'=>'已完成的订单','0'=>'已取消的订单'] as $k=>$v}
-        {if isset($type) and $type eq $k}
-        <li class="layui-this" data-open="{:url('index')}?type={$k}">{$v}<sup class="layui-badge border-radius">{$total[$k]??0}</sup></li>
-        {else}
-        <li data-open="{:url('index')}?type={$k}">{$v}<sup class="layui-badge border-radius">{$total[$k]??0}</sup></li>
-        {/if}{/foreach}
-    </ul>
-    <div class="layui-tab-content">
-        {include file='shop_order_service/index_search'}
-        <table class="layui-table margin-top-10" lay-skin="line">
-            {notempty name='list'}
-            <thead>
-            <tr>
-                <th class='list-table-check-td think-checkbox'>
-                    <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
-                </th>
-                <th style="width:360px">用户信息</th>
-                <th style="width:360px">订单信息</th>
-                <th>发货信息</th>
-                <th>商品信息</th>
-            </tr>
-            </thead>
-            {/notempty}
-            <tbody>
-            {foreach $list as $key=>$vo}
-            <tr>
-                <td class='list-table-check-td think-checkbox'>
-                    <label><input class="list-check-box" type='checkbox' value='{$vo.id}'></label>
-                </td>
-                <td class="nowrap relative">
-                    <div>
-                        <img alt="img" class="margin-right-5" data-tips-image src="{$vo.from.headimg|default='__ROOT__/static/theme/img/headimg.png'}" style="width:35px;height:35px">
-                        <div class="inline-block text-middle sub-span-blue">
-                            推荐用户：{$vo.from.nickname|default='--'}<br>
-                            推荐手机：<span>{$vo.from.phone|default='--'}</span>{notempty name='vo.from.vip_level'} [ <b class="color-red">VIP{$vo.from.vip_level}</b> ] <b class="color-red">{$vo.from.vip_title}</b>{/notempty}<br>
-                        </div>
-                    </div>
-                    <div>
-                        <img alt="img" class="margin-right-5" data-tips-image src="{$vo.member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" style="width:35px;height:35px">
-                        <div class="inline-block text-middle sub-span-blue">
-                            用户昵称：{$vo.member.nickname|default='--'}<br>
-                            用户手机：<span>{$vo.member.phone|default='--'}</span>{notempty name='vo.member.vip_level'} [ <b class="color-red">VIP{$vo.member.vip_level}</b> ] <b class="color-red">{$vo.member.vip_title}</b>{/notempty}<br>
-                        </div>
-                    </div>
-                </td>
-                <td class='nowrap'>
-                    <div class="inline-block margin-right-5 think-badge-middle notselect padding-left-5">
-                        {eq name='vo.status' value='0'}<span class="layui-badge layui-bg-gray" data-tips-text="{$vo.cancel_description}">已取消</span>{/eq}
-                        {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-red">预订单</span>{/eq}
-                        {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-orange">待付款</span>{/eq}
-                        {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-black">待发货</span>{/eq}
-                        {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-green">已发货</span>{/eq}
-                        {eq name='vo.status' value='5'}<span class="layui-badge layui-bg-blue">已完成</span>{/eq}
-                    </div>
-                    <div class="inline-block text-middle">
-                        订单单号：<span class="color-blue">{$vo.order_no|default=''}</span><br>
-                        订单金额：<b class="color-blue">{$vo.price_total+0}</b> 元<span class="color-blue">{if $vo.price_express>0}（含{$vo.price_express+0}元）{else}（包邮）{/if}</span>已支付 <strong class="color-blue">{$vo.pay_price+0}</strong> 元<br>
-                        下单时间：{$vo.create_at|format_datetime}<br>
-                        支付时间：{$vo.pay_datetime|format_datetime}{if $vo.pay_datetime}<span class="color-blue"> ({$vo.pay_type|default='-'})</span>{/if}<br>
-                    </div>
-                </td>
-                <td class="nowrap">
-                    收货信息：{$vo.express_name|default='--'}<span class="margin-left-5 color-blue">{$vo.express_phone}</span><br>
-                    收货地址：{$vo.express_province|default='--'}{$vo.express_city}{$vo.express_area}{$vo.express_address}<br>
-                    发货状态：{eq name='vo.express_state' value='0'}
-                    <span class="layui-badge layui-bg-black">未发货</span>
-                    {else}
-                    <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
-                    <a class="layui-badge layui-bg-gray margin-left-5" data-modal="{:url('truckQuery')}?code={$vo.express_company_code}&number={$vo.express_send_no}"
-                       data-tips-text="快递追踪查询"
-                       data-title="{$vo.express_company_title}（{$vo.express_send_no}）">{$vo.express_send_no|default='--'}</a>
-                    {/eq}
-                    {if $vo.status eq 3}
-                    <a class=" margin-left-5" data-modal="{:url('express')}?id={$vo.id}" data-title="填写订单信息">填写发货</a>
-                    <!--{if auth('store/order/pushJushuitan') && isset($jushuitanType) and $jushuitanType > 0}-->
-                    <a class=" margin-left-5" data-confirm="确认要使用仓库发货吗？" data-load="{:url('pushJushuitan')}?order_no={$vo.order_no}">提交仓库</a>
-                    <!--{/if}-->
-                    <!--{if auth('cancel')}-->
-                    <a class=" margin-left-5" data-confirm="确认要取消并创建退款申请吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消并退款</a>
-                    <!--{/if}-->
-                    {elseif $vo.status eq 4}
-                    <a class=" margin-left-5" data-modal="{:url('express')}?id={$vo.id}" data-title="修改发货信息">修改发货</a>
-                    {/if}
-                    <br>
-                    发货时间：{$vo.express_send_at|format_datetime}<br>
-                </td>
-                <td class="nowrap">
-                    {foreach $vo.list as $g}
-                    <div>
-                        {if $g.vip_mod > 0 and $g.vip_level > $g.discount_vip}
-                        [ <b class="color-red">VIP{$g.discount_vip}</b> <b class="layui-icon font-s10 color-blue">&#xe65b;</b> <b class="color-red">VIP{$g.vip_level}</b> ]
-                        {else}
-                        [ <b class="color-blue">VIP{$g.discount_vip}</b> ]
-                        {/if}
-                        {if $g.discount_rate<100.00}
-                        <b class="color-blue">享{$g.discount_rate+0}%折扣</b>
-                        <b class="color-red">x</b>
-                        {/if}
-                        <b class="color-blue">{$g.number_goods|default=0}件</b>
-                        <b class="color-red">x</b>
-                        <b class="color-blue">{$g.goods_price_market+0}元 </b>
-                        {$g.goods_title|default=''} <span class="color-green">( {$g.goods_spec|show_goods_spec})</span>
-                    </div>
-                    {/foreach}
-                </td>
-            </tr>
-            {/foreach}
-            </tbody>
-        </table>
-
-        {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-
-    </div>
-</div>
-<style>
-    .think-badge-middle .layui-badge {
-        width: 1em;
-        height: 68px;
-        padding-top: 5px;
-        line-height: 21px;
-        white-space: normal;
-        vertical-align: middle;
-    }
-</style>
-{/block}

app/data/view/shop_order_service/index_search.html

@@ -1,136 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form action="{:request()->url()}" autocomplete="off" class="layui-form layui-form-pane form-search" method="get" onsubmit="return false">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户手机</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="member_phone" placeholder="请输入用户手机" value="{:input('member_phone')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户昵称</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="member_nickname" placeholder="请输入用户昵称" value="{:input('member_nickname')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">推荐手机</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="agent_phone" placeholder="请输入用户手机" value="{:input('agent_phone')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">推荐昵称</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="agent_nickname" placeholder="请输入用户昵称" value="{:input('agent_nickname')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单单号</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="order_no" placeholder="请输入订单单号" value="{:input('order_no')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">发货单号</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_send_no" placeholder="请输入发货单号" value="{:input('express_send_no')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
-            <label class="layui-input-inline">
-                <select class="layui-select" name="status">
-                    <option value="">-- 全部 --</option>
-                    {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
-                    {if input('status') eq $k.''}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option value="{$k}">{$v}</option>
-                    {/if}{/foreach}
-                </select>
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">付款状态</label>
-            <label class="layui-input-inline">
-                <select class="layui-select" name="pay_state">
-                    <option value="">-- 全部 --</option>
-                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
-                    {if input('pay_state') eq $k.''}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option value="{$k}">{$v}</option>
-                    {/if}{/foreach}
-                </select>
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">下单时间</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" data-date-range name="create_at" placeholder="请选择下单时间" value="{:input('create_at')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付时间</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" data-date-range name="pay_datetime" placeholder="请选择支付时间" value="{:input('pay_datetime')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货姓名</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_name" placeholder="请输入收货姓名" value="{:input('express_name')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货手机</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_phone" placeholder="请输入收货手机" value="{:input('express_phone')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货省份</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_province" placeholder="请输入收货省份" value="{:input('express_province')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货城市</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_city" placeholder="请输入收货城市" value="{:input('express_city')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货区域</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_area" placeholder="请输入收货区域" value="{:input('express_area')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">详细地址</label>
-            <label class="layui-input-inline">
-                <input class="layui-input" name="express_address" placeholder="请输入详细地址" value="{:input('express_address')}">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-</fieldset>

app/data/view/user/index.html → app/data/view/user/admin/index.html

@@ -8,7 +8,7 @@
 
 {block name="content"}
 <div class="think-box-shadow">
-    {include file='user/index_search'}
+    {include file='user/admin/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/user_balance/index.html → app/data/view/user/balance/index.html

@@ -11,7 +11,7 @@
     余额统计：累计已充值余额 {$balance.0|default=0.00} 元，已使用 {$balance.1|default=0.00} 元，剩余可使用 {$balance.0-$balance.1} 元。
 </div>
 <div class="think-box-shadow margin-top-10">
-    {include file='user_balance/index_search'}
+    {include file='user/balance/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/user_message/index.html → app/data/view/user/message/index.html

@@ -8,7 +8,7 @@
 
 {block name="content"}
 <div class="think-box-shadow">
-    {include file='user_message/index_search'}
+    {include file='user/message/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/user_rebate/index.html → app/data/view/user/rebate/index.html

@@ -11,7 +11,7 @@
     返利统计：累计已产生返利 <b>{$rebate.0+$rebate.2}</b> 元 ( 含未到账 <b>{$rebate.2|default='0.00'}</b> 元 )，累计已提现 <b>{$total.1|default=0.00}</b> 元。
 </div>
 <div class="think-box-shadow margin-top-10">
-    {include file='user_rebate/index_search'}
+    {include file='user/rebate/index_search'}
     <table class="layui-table" lay-skin="line">
         {notempty name='list'}
         <thead>

app/data/view/user_transfer/index.html → app/data/view/user/transfer/index.html

@@ -20,7 +20,7 @@
     提现统计：已产生提现累计 {$transfer.0|default=0.00} 元（ 含待转账 {$transfer.3|default='0.00'} 元，含待审核 {$transfer.2|default='0.00'} 元 ），累计已提现 {$transfer.1|default=0.00} 元。
 </div>
 <div class="think-box-shadow margin-top-10">
-    {include file='user_transfer/index_search'}
+    {include file='user/transfer/index_search'}
     <table class="layui-table" lay-skin="line">
         {notempty name='list'}
         <thead>

vendor/composer/autoload_classmap.php

@@ -203,26 +203,6 @@ return array(
     'app\\data\\command\\UserAmount' => $baseDir . '/app/data/command/UserAmount.php',
     'app\\data\\command\\UserTransfer' => $baseDir . '/app/data/command/UserTransfer.php',
     'app\\data\\command\\UserUpgrade' => $baseDir . '/app/data/command/UserUpgrade.php',
-    'app\\data\\controller\\BaseConfig' => $baseDir . '/app/data/controller/BaseConfig.php',
-    'app\\data\\controller\\BaseDiscount' => $baseDir . '/app/data/controller/BaseDiscount.php',
-    'app\\data\\controller\\BaseMessage' => $baseDir . '/app/data/controller/BaseMessage.php',
-    'app\\data\\controller\\BasePayment' => $baseDir . '/app/data/controller/BasePayment.php',
-    'app\\data\\controller\\BasePostageCompany' => $baseDir . '/app/data/controller/BasePostageCompany.php',
-    'app\\data\\controller\\BasePostageTemplate' => $baseDir . '/app/data/controller/BasePostageTemplate.php',
-    'app\\data\\controller\\BaseUpgrade' => $baseDir . '/app/data/controller/BaseUpgrade.php',
-    'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php',
-    'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php',
-    'app\\data\\controller\\ShopGoods' => $baseDir . '/app/data/controller/ShopGoods.php',
-    'app\\data\\controller\\ShopGoodsCate' => $baseDir . '/app/data/controller/ShopGoodsCate.php',
-    'app\\data\\controller\\ShopGoodsMark' => $baseDir . '/app/data/controller/ShopGoodsMark.php',
-    'app\\data\\controller\\ShopOrder' => $baseDir . '/app/data/controller/ShopOrder.php',
-    'app\\data\\controller\\ShopOrderSend' => $baseDir . '/app/data/controller/ShopOrderSend.php',
-    'app\\data\\controller\\ShopOrderService' => $baseDir . '/app/data/controller/ShopOrderService.php',
-    'app\\data\\controller\\User' => $baseDir . '/app/data/controller/User.php',
-    'app\\data\\controller\\UserBalance' => $baseDir . '/app/data/controller/UserBalance.php',
-    'app\\data\\controller\\UserMessage' => $baseDir . '/app/data/controller/UserMessage.php',
-    'app\\data\\controller\\UserRebate' => $baseDir . '/app/data/controller/UserRebate.php',
-    'app\\data\\controller\\UserTransfer' => $baseDir . '/app/data/controller/UserTransfer.php',
     'app\\data\\controller\\api\\Auth' => $baseDir . '/app/data/controller/api/Auth.php',
     'app\\data\\controller\\api\\Data' => $baseDir . '/app/data/controller/api/Data.php',
     'app\\data\\controller\\api\\Goods' => $baseDir . '/app/data/controller/api/Goods.php',
@@ -238,6 +218,25 @@ return array(
     'app\\data\\controller\\api\\auth\\Order' => $baseDir . '/app/data/controller/api/auth/Order.php',
     'app\\data\\controller\\api\\auth\\Rebate' => $baseDir . '/app/data/controller/api/auth/Rebate.php',
     'app\\data\\controller\\api\\auth\\Transfer' => $baseDir . '/app/data/controller/api/auth/Transfer.php',
+    'app\\data\\controller\\base\\Config' => $baseDir . '/app/data/controller/base/Config.php',
+    'app\\data\\controller\\base\\Discount' => $baseDir . '/app/data/controller/base/Discount.php',
+    'app\\data\\controller\\base\\Message' => $baseDir . '/app/data/controller/base/Message.php',
+    'app\\data\\controller\\base\\Payment' => $baseDir . '/app/data/controller/base/Payment.php',
+    'app\\data\\controller\\base\\Upgrade' => $baseDir . '/app/data/controller/base/Upgrade.php',
+    'app\\data\\controller\\base\\postage\\Company' => $baseDir . '/app/data/controller/base/postage/Company.php',
+    'app\\data\\controller\\base\\postage\\Template' => $baseDir . '/app/data/controller/base/postage/Template.php',
+    'app\\data\\controller\\news\\Item' => $baseDir . '/app/data/controller/news/Item.php',
+    'app\\data\\controller\\news\\Mark' => $baseDir . '/app/data/controller/news/Mark.php',
+    'app\\data\\controller\\shop\\Cate' => $baseDir . '/app/data/controller/shop/Cate.php',
+    'app\\data\\controller\\shop\\Goods' => $baseDir . '/app/data/controller/shop/Goods.php',
+    'app\\data\\controller\\shop\\Mark' => $baseDir . '/app/data/controller/shop/Mark.php',
+    'app\\data\\controller\\shop\\Order' => $baseDir . '/app/data/controller/shop/Order.php',
+    'app\\data\\controller\\shop\\Send' => $baseDir . '/app/data/controller/shop/Send.php',
+    'app\\data\\controller\\user\\Admin' => $baseDir . '/app/data/controller/user/Admin.php',
+    'app\\data\\controller\\user\\Balance' => $baseDir . '/app/data/controller/user/Balance.php',
+    'app\\data\\controller\\user\\Message' => $baseDir . '/app/data/controller/user/Message.php',
+    'app\\data\\controller\\user\\Rebate' => $baseDir . '/app/data/controller/user/Rebate.php',
+    'app\\data\\controller\\user\\Transfer' => $baseDir . '/app/data/controller/user/Transfer.php',
     'app\\data\\service\\ExpressService' => $baseDir . '/app/data/service/ExpressService.php',
     'app\\data\\service\\GoodsService' => $baseDir . '/app/data/service/GoodsService.php',
     'app\\data\\service\\MessageService' => $baseDir . '/app/data/service/MessageService.php',

vendor/composer/autoload_static.php

@@ -332,26 +332,6 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53
         'app\\data\\command\\UserAmount' => __DIR__ . '/../..' . '/app/data/command/UserAmount.php',
         'app\\data\\command\\UserTransfer' => __DIR__ . '/../..' . '/app/data/command/UserTransfer.php',
         'app\\data\\command\\UserUpgrade' => __DIR__ . '/../..' . '/app/data/command/UserUpgrade.php',
-        'app\\data\\controller\\BaseConfig' => __DIR__ . '/../..' . '/app/data/controller/BaseConfig.php',
-        'app\\data\\controller\\BaseDiscount' => __DIR__ . '/../..' . '/app/data/controller/BaseDiscount.php',
-        'app\\data\\controller\\BaseMessage' => __DIR__ . '/../..' . '/app/data/controller/BaseMessage.php',
-        'app\\data\\controller\\BasePayment' => __DIR__ . '/../..' . '/app/data/controller/BasePayment.php',
-        'app\\data\\controller\\BasePostageCompany' => __DIR__ . '/../..' . '/app/data/controller/BasePostageCompany.php',
-        'app\\data\\controller\\BasePostageTemplate' => __DIR__ . '/../..' . '/app/data/controller/BasePostageTemplate.php',
-        'app\\data\\controller\\BaseUpgrade' => __DIR__ . '/../..' . '/app/data/controller/BaseUpgrade.php',
-        'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php',
-        'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php',
-        'app\\data\\controller\\ShopGoods' => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php',
-        'app\\data\\controller\\ShopGoodsCate' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsCate.php',
-        'app\\data\\controller\\ShopGoodsMark' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsMark.php',
-        'app\\data\\controller\\ShopOrder' => __DIR__ . '/../..' . '/app/data/controller/ShopOrder.php',
-        'app\\data\\controller\\ShopOrderSend' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderSend.php',
-        'app\\data\\controller\\ShopOrderService' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderService.php',
-        'app\\data\\controller\\User' => __DIR__ . '/../..' . '/app/data/controller/User.php',
-        'app\\data\\controller\\UserBalance' => __DIR__ . '/../..' . '/app/data/controller/UserBalance.php',
-        'app\\data\\controller\\UserMessage' => __DIR__ . '/../..' . '/app/data/controller/UserMessage.php',
-        'app\\data\\controller\\UserRebate' => __DIR__ . '/../..' . '/app/data/controller/UserRebate.php',
-        'app\\data\\controller\\UserTransfer' => __DIR__ . '/../..' . '/app/data/controller/UserTransfer.php',
         'app\\data\\controller\\api\\Auth' => __DIR__ . '/../..' . '/app/data/controller/api/Auth.php',
         'app\\data\\controller\\api\\Data' => __DIR__ . '/../..' . '/app/data/controller/api/Data.php',
         'app\\data\\controller\\api\\Goods' => __DIR__ . '/../..' . '/app/data/controller/api/Goods.php',
@@ -367,6 +347,25 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53
         'app\\data\\controller\\api\\auth\\Order' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Order.php',
         'app\\data\\controller\\api\\auth\\Rebate' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Rebate.php',
         'app\\data\\controller\\api\\auth\\Transfer' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Transfer.php',
+        'app\\data\\controller\\base\\Config' => __DIR__ . '/../..' . '/app/data/controller/base/Config.php',
+        'app\\data\\controller\\base\\Discount' => __DIR__ . '/../..' . '/app/data/controller/base/Discount.php',
+        'app\\data\\controller\\base\\Message' => __DIR__ . '/../..' . '/app/data/controller/base/Message.php',
+        'app\\data\\controller\\base\\Payment' => __DIR__ . '/../..' . '/app/data/controller/base/Payment.php',
+        'app\\data\\controller\\base\\Upgrade' => __DIR__ . '/../..' . '/app/data/controller/base/Upgrade.php',
+        'app\\data\\controller\\base\\postage\\Company' => __DIR__ . '/../..' . '/app/data/controller/base/postage/Company.php',
+        'app\\data\\controller\\base\\postage\\Template' => __DIR__ . '/../..' . '/app/data/controller/base/postage/Template.php',
+        'app\\data\\controller\\news\\Item' => __DIR__ . '/../..' . '/app/data/controller/news/Item.php',
+        'app\\data\\controller\\news\\Mark' => __DIR__ . '/../..' . '/app/data/controller/news/Mark.php',
+        'app\\data\\controller\\shop\\Cate' => __DIR__ . '/../..' . '/app/data/controller/shop/Cate.php',
+        'app\\data\\controller\\shop\\Goods' => __DIR__ . '/../..' . '/app/data/controller/shop/Goods.php',
+        'app\\data\\controller\\shop\\Mark' => __DIR__ . '/../..' . '/app/data/controller/shop/Mark.php',
+        'app\\data\\controller\\shop\\Order' => __DIR__ . '/../..' . '/app/data/controller/shop/Order.php',
+        'app\\data\\controller\\shop\\Send' => __DIR__ . '/../..' . '/app/data/controller/shop/Send.php',
+        'app\\data\\controller\\user\\Admin' => __DIR__ . '/../..' . '/app/data/controller/user/Admin.php',
+        'app\\data\\controller\\user\\Balance' => __DIR__ . '/../..' . '/app/data/controller/user/Balance.php',
+        'app\\data\\controller\\user\\Message' => __DIR__ . '/../..' . '/app/data/controller/user/Message.php',
+        'app\\data\\controller\\user\\Rebate' => __DIR__ . '/../..' . '/app/data/controller/user/Rebate.php',
+        'app\\data\\controller\\user\\Transfer' => __DIR__ . '/../..' . '/app/data/controller/user/Transfer.php',
         'app\\data\\service\\ExpressService' => __DIR__ . '/../..' . '/app/data/service/ExpressService.php',
         'app\\data\\service\\GoodsService' => __DIR__ . '/../..' . '/app/data/service/GoodsService.php',
         'app\\data\\service\\MessageService' => __DIR__ . '/../..' . '/app/data/service/MessageService.php',

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2021-03-26 18:34:51
+// This file is automatically generated at:2021-03-27 14:25:59
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',