From d60e59b3c530727518d4616695759f75862b42d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Wed, 7 Apr 2021 13:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQL01-数据表结构.sql | 10 +++++----- app/data/controller/user/Balance.php | 2 +- app/data/service/UserUpgradeService.php | 2 +- app/data/view/user/balance/form.html | 4 ++-- app/data/view/user/balance/index_search.html | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SQL01-数据表结构.sql b/SQL01-数据表结构.sql index 82406e16c..6c3fa7c90 100644 --- a/SQL01-数据表结构.sql +++ b/SQL01-数据表结构.sql @@ -11,7 +11,7 @@ Target Server Version : 80018 File Encoding : 65001 - Date: 07/04/2021 11:29:47 + Date: 07/04/2021 13:37:02 */ SET NAMES utf8mb4; @@ -27,7 +27,7 @@ CREATE TABLE `data_base_discount` ( `items` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '方案规则', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '方案描述', `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序权重', - `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '方案状态(1使用,0禁用)', + `status` tinyint(1) NULL DEFAULT 1 COMMENT '方案状态(1使用,0禁用)', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '删除状态', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, @@ -332,7 +332,7 @@ CREATE TABLE `data_user_balance` ( `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '充值名称', `remark` varchar(999) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '充值备注', `amount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '充值金额', - `vip_upgrade` tinyint(20) NULL DEFAULT 0 COMMENT '强制升级', + `upgrade` tinyint(20) NULL DEFAULT 0 COMMENT '强制升级', `deleted` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '删除状态', `create_by` bigint(20) NULL DEFAULT 0 COMMENT '系统用户', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', @@ -774,7 +774,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 = 27 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 40 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-配置' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_data @@ -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 = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 202 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_queue diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php index 3fd441894..17f9adef4 100644 --- a/app/data/controller/user/Balance.php +++ b/app/data/controller/user/Balance.php @@ -38,7 +38,7 @@ class Balance extends Controller // 现有余额类型 $this->names = $this->app->db->name($this->table)->group('name')->column('name'); // 创建查询对象 - $query = $this->_query($this->table)->equal('name,vip_upgrade'); + $query = $this->_query($this->table)->equal('name,upgrade'); // 用户搜索查询 $db = $this->_query('DataUser')->like('phone#user_phone,nickname#user_nickname')->db(); if ($db->getOptions('where')) $query->whereRaw("uid in {$db->field('id')->buildSql()}"); diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php index c6746e4ff..0e849adf7 100644 --- a/app/data/service/UserUpgradeService.php +++ b/app/data/service/UserUpgradeService.php @@ -107,7 +107,7 @@ class UserUpgradeService extends Service $orderNo = null; } // 后台余额充值升级 - $tmpCode = $this->app->db->name('DataUserBalance')->where(['uid' => $uid, 'deleted' => 0])->max('vip_upgrade'); + $tmpCode = $this->app->db->name('DataUserBalance')->where(['uid' => $uid, 'deleted' => 0])->max('upgrade'); if ($tmpCode > $vipCode) { $map = ['status' => 1, 'number' => $tmpCode]; $upgrade = $this->app->db->name('DataBaseUpgrade')->where($map)->find(); diff --git a/app/data/view/user/balance/form.html b/app/data/view/user/balance/form.html index cb36d7f1f..fcc8abdc2 100644 --- a/app/data/view/user/balance/form.html +++ b/app/data/view/user/balance/form.html @@ -46,9 +46,9 @@
升级用户等级 Upgrade - - {foreach $upgrades as $upgrade}{if isset($vo.vip_upgrade) and $vo.vip_upgrade eq $upgrade.number} + {foreach $upgrades as $upgrade}{if isset($vo.upgrade) and $vo.upgrade eq $upgrade.number} {else} diff --git a/app/data/view/user/balance/index_search.html b/app/data/view/user/balance/index_search.html index f34590059..4ee593ee0 100644 --- a/app/data/view/user/balance/index_search.html +++ b/app/data/view/user/balance/index_search.html @@ -19,9 +19,9 @@
- - {foreach $upgrades as $upgrade}{if input('vip_upgrade') eq $upgrade.number} + {foreach $upgrades as $upgrade}{if input('upgrade') eq $upgrade.number} {else}