From f4e12a183070e9fc1db174dfb7f1c9a59f7763a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 四月 2025 09:08:23 +0800
Subject: [PATCH] 新增加功能
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java | 40 +++++
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java | 8 +
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java | 3
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 48 ++++++
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html | 3
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CouponWarpper.java | 13 +
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 26 +++
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 8 +
/dev/null | 38 -----
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java | 11 +
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java | 3
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js | 14 ++
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 27 ++-
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 45 ++++++
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java | 4
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml | 46 ++++++
ManagementOKTravel/guns-admin/src/main/resources/application.yml | 33 +---
17 files changed, 275 insertions(+), 95 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 426cd9b..2731db8 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -454,6 +454,7 @@
orderTaxi.setGetoffLat(lat);
orderTaxi.setGetoffAddress(address);
orderTaxi.setGetoffTime(new Date());
+ orderTaxi.setEndServiceTime(new Date());
if(orderTaxi.getPayManner()==3){
orderTaxi.setState(9);
Driver driver = driverService.selectById(orderTaxi.getDriverId());
@@ -476,10 +477,46 @@
transactionDetails.setOrderId(orderTaxi.getId());
transactionDetailsMapper.insert(transactionDetails);
driverService.updateById(driver);
- }else {
- orderTaxi.setState(6);
}
- orderTaxi.setEndServiceTime(new Date());
+ //打表计费，直接订单完成支付，
+ if(orderTaxi.getPayManner()==2){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ //在线上计费的基础上随机加0.01-1的金额
+ Double orderMoney = orderTaxi.getOrderMoney() + (new BigDecimal(Math.random()).setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
+ orderTaxi.setState(8);
+ orderTaxi.setOrderMoney(orderMoney);
+ orderTaxi.setPayMoney(orderMoney);
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+
+ Company company = companyService.selectById(driver.getFranchiseeId());
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ TransactionDetails transactionDetails = new TransactionDetails();
+ driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+ transactionDetails.setMoney(company.getFixedDeduction());
+ // 新增扣除使用费记录
+ transactionDetails.setUserId(driver.getId());
+ transactionDetails.setInsertTime(new Date());
+ transactionDetails.setRemark("软件使用费");
+ transactionDetails.setState(2);
+ transactionDetails.setType(1);
+ transactionDetails.setUserType(2);
+ transactionDetails.setOrderType(6);
+ transactionDetails.setOrderId(orderTaxi.getId());
+ transactionDetailsMapper.insert(transactionDetails);
+ driverService.updateById(driver);
+ }
+ //线上计费，计算费用后修改为待支付
+ if(orderTaxi.getPayManner()==1){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ orderTaxi.setState(7);
+ }
+ //回滚司机状态为空闲
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+ driver.setState(2);
+ driverService.updateById(driver);
+
pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
break;
@@ -487,11 +524,12 @@
this.updateById(orderTaxi);
// TODO: 2020/6/5 推送状态
+ OrderTaxi finalOrderTaxi = orderTaxi;
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
}
}).start();
return ResultUtil.success();
diff --git a/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql b/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql
deleted file mode 100644
index ce57b0a..0000000
--- a/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-Navicat MySQL Data Transfer
-
-Source Server : localhost_3306(123456)
-Source Server Version : 50721
-Source Host : localhost:3306
-Source Database : basepro
-
-Target Server Type : MYSQL
-Target Server Version : 50721
-File Encoding : 65001
-
-Date: 2019-01-11 16:23:18
-*/
-
-SET FOREIGN_KEY_CHECKS=0;
-
--- ----------------------------
--- Table structure for sys_dept
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dept`;
-CREATE TABLE `sys_dept` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '排序',
- `pid` int(11) DEFAULT NULL COMMENT '父部门id',
- `pids` varchar(255) DEFAULT NULL COMMENT '父级ids',
- `simplename` varchar(45) DEFAULT NULL COMMENT '简称',
- `fullname` varchar(255) DEFAULT NULL COMMENT '全称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `version` int(11) DEFAULT NULL COMMENT '版本（乐观锁保留字段）',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8 COMMENT='部门表';
-
--- ----------------------------
--- Records of sys_dept
--- ----------------------------
-INSERT INTO `sys_dept` VALUES ('24', '1', '0', '[0],', '总公司', '总公司', '', null);
-INSERT INTO `sys_dept` VALUES ('25', '2', '24', '[0],[24],', '开发部', '开发部', '', null);
-INSERT INTO `sys_dept` VALUES ('26', '3', '24', '[0],[24],', '运营部', '运营部', '', null);
-INSERT INTO `sys_dept` VALUES ('27', '4', '24', '[0],[24],', '战略部', '战略部', '', null);
-
--- ----------------------------
--- Table structure for sys_dict
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dict`;
-CREATE TABLE `sys_dict` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '排序',
- `pid` int(11) DEFAULT NULL COMMENT '父级字典',
- `name` varchar(255) DEFAULT NULL COMMENT '名称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `code` varchar(255) DEFAULT NULL COMMENT '值',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8 COMMENT='字典表';
-
--- ----------------------------
--- Records of sys_dict
--- ----------------------------
-INSERT INTO `sys_dict` VALUES ('50', '0', '0', '性别', null, 'sys_sex');
-INSERT INTO `sys_dict` VALUES ('51', '1', '50', '男', null, '1');
-INSERT INTO `sys_dict` VALUES ('52', '2', '50', '女', null, '2');
-INSERT INTO `sys_dict` VALUES ('53', '0', '0', '状态', null, 'sys_state');
-INSERT INTO `sys_dict` VALUES ('54', '1', '53', '启用', null, '1');
-INSERT INTO `sys_dict` VALUES ('55', '2', '53', '禁用', null, '2');
-INSERT INTO `sys_dict` VALUES ('56', '0', '0', '账号状态', null, 'account_state');
-INSERT INTO `sys_dict` VALUES ('57', '1', '56', '启用', null, '1');
-INSERT INTO `sys_dict` VALUES ('58', '2', '56', '冻结', null, '2');
-INSERT INTO `sys_dict` VALUES ('59', '3', '56', '已删除', null, '3');
-
--- ----------------------------
--- Table structure for sys_expense
--- ----------------------------
-DROP TABLE IF EXISTS `sys_expense`;
-CREATE TABLE `sys_expense` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `money` decimal(20,2) DEFAULT NULL COMMENT '报销金额',
- `desc` varchar(255) DEFAULT '' COMMENT '描述',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `state` int(11) DEFAULT NULL COMMENT '状态: 1.待提交 2:待审核 3.审核通过 4:驳回',
- `userid` int(11) DEFAULT NULL COMMENT '用户id',
- `processId` varchar(255) DEFAULT NULL COMMENT '流程定义id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='报销表';
-
--- ----------------------------
--- Records of sys_expense
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_login_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_login_log`;
-CREATE TABLE `sys_login_log` (
- `id` int(65) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `logname` varchar(255) DEFAULT NULL COMMENT '日志名称',
- `userid` int(65) DEFAULT NULL COMMENT '管理员id',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `succeed` varchar(255) DEFAULT NULL COMMENT '是否执行成功',
- `message` text COMMENT '具体消息',
- `ip` varchar(255) DEFAULT NULL COMMENT '登录ip',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=259 DEFAULT CHARSET=utf8 COMMENT='登录记录';
-
--- ----------------------------
--- Records of sys_login_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_menu
--- ----------------------------
-DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE `sys_menu` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `code` varchar(255) DEFAULT NULL COMMENT '菜单编号',
- `pcode` varchar(255) DEFAULT NULL COMMENT '菜单父编号',
- `pcodes` varchar(255) DEFAULT NULL COMMENT '当前菜单的所有父菜单编号',
- `name` varchar(255) DEFAULT NULL COMMENT '菜单名称',
- `icon` varchar(255) DEFAULT NULL COMMENT '菜单图标',
- `url` varchar(255) DEFAULT NULL COMMENT 'url地址',
- `num` int(65) DEFAULT NULL COMMENT '菜单排序号',
- `levels` int(65) DEFAULT NULL COMMENT '菜单层级',
- `ismenu` int(11) DEFAULT NULL COMMENT '是否是菜单（1：是 0：不是）',
- `tips` varchar(255) DEFAULT NULL COMMENT '备注',
- `status` int(65) DEFAULT NULL COMMENT '菜单状态 : 1:启用 0:不启用',
- `isopen` int(11) DEFAULT NULL COMMENT '是否打开: 1:打开 0:不打开',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=561 DEFAULT CHARSET=utf8 COMMENT='菜单表';
-
--- ----------------------------
--- Records of sys_menu
--- ----------------------------
-INSERT INTO `sys_menu` VALUES ('1', 'code', '0', '[0],', '代码生成', 'fa-code', '/code', '1', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('100', 'system', '0', '[0],', '系统管理', 'fa-user', '#', '100', '1', '1', null, '1', '1');
-INSERT INTO `sys_menu` VALUES ('101', 'mgr', 'system', '[0],[system],', '平台管理员', '', '/mgr', '101', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('102', 'mgr_list', 'mgr', '[0],[system],[mgr],', '用户列表', '', '/mgr/list', '102', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('103', 'mgr_add', 'mgr', '[0],[system],[mgr],', '添加用户', null, '/mgr/add', '103', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('104', 'mgr_edit', 'mgr', '[0],[system],[mgr],', '修改用户', null, '/mgr/edit', '104', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('105', 'mgr_delete', 'mgr', '[0],[system],[mgr],', '删除用户', null, '/mgr/delete', '105', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('106', 'mgr_reset', 'mgr', '[0],[system],[mgr],', '重置密码', null, '/mgr/reset', '106', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('107', 'mgr_freeze', 'mgr', '[0],[system],[mgr],', '冻结用户', null, '/mgr/freeze', '107', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('108', 'mgr_unfreeze', 'mgr', '[0],[system],[mgr],', '解除冻结用户', null, '/mgr/unfreeze', '108', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('109', 'mgr_setRole', 'mgr', '[0],[system],[mgr],', '分配角色', null, '/mgr/setRole', '109', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('110', 'to_assign_role', 'mgr', '[0],[system],[mgr],', '分配角色跳转', '', '/mgr/role_assign', '110', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('111', 'to_user_edit', 'mgr', '[0],[system],[mgr],', '编辑用户跳转', '', '/mgr/user_edit', '111', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('120', 'role', 'system', '[0],[system],', '角色管理', null, '/role', '120', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('121', 'role_list', 'role', '[0],[system],[role],', '角色列表', '', '/role/list', '121', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('122', 'role_add', 'role', '[0],[system],[role],', '添加角色', null, '/role/add', '122', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('123', 'role_edit', 'role', '[0],[system],[role],', '修改角色', null, '/role/edit', '123', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('124', 'role_remove', 'role', '[0],[system],[role],', '删除角色', null, '/role/remove', '124', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('125', 'role_setAuthority', 'role', '[0],[system],[role],', '配置权限', null, '/role/setAuthority', '125', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('126', 'to_role_edit', 'role', '[0],[system],[role],', '修改角色跳转', '', '/role/role_edit', '126', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('127', 'to_role_assign', 'role', '[0],[system],[role],', '角色分配跳转', '', '/role/role_assign', '127', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('130', 'menu', 'system', '[0],[system],', '菜单管理', null, '/menu', '130', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('131', 'menu_list', 'menu', '[0],[system],[menu],', '菜单列表', '', '/menu/list', '131', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('132', 'menu_add', 'menu', '[0],[system],[menu],', '添加菜单', null, '/menu/add', '132', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('133', 'menu_edit', 'menu', '[0],[system],[menu],', '修改菜单', null, '/menu/edit', '133', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('134', 'menu_remove', 'menu', '[0],[system],[menu],', '删除菜单', null, '/menu/remove', '134', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('135', 'to_menu_edit', 'menu', '[0],[system],[menu],', '菜单编辑跳转', '', '/menu/menu_edit', '135', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('140', 'dept', 'system', '[0],[system],', '部门管理', null, '/dept', '140', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('141', 'dept_list', 'dept', '[0],[system],[dept],', '部门列表', '', '/dept/list', '141', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('142', 'dept_add', 'dept', '[0],[system],[dept],', '添加部门', null, '/dept/add', '142', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('143', 'dept_update', 'dept', '[0],[system],[dept],', '修改部门', null, '/dept/update', '143', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('144', 'dept_delete', 'dept', '[0],[system],[dept],', '删除部门', null, '/dept/delete', '144', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('145', 'dept_detail', 'dept', '[0],[system],[dept],', '部门详情', '', '/dept/detail', '145', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('146', 'to_dept_update', 'dept', '[0],[system],[dept],', '修改部门跳转', '', '/dept/dept_update', '146', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('200', 'loginLog', 'system', '[0],[system],', '登录日志', null, '/loginLog', '200', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('201', 'login_log_list', 'loginLog', '[0],[system],[loginLog],', '登录日志列表', '', '/loginLog/list', '201', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('202', 'del_login_log', 'loginLog', '[0],[system],[loginLog],', '清空登录日志', '', '/loginLog/delLoginLog', '202', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('210', 'log', 'system', '[0],[system],', '业务日志', null, '/log', '210', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('211', 'log_list', 'log', '[0],[system],[log],', '日志列表', '', '/log/list', '211', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('212', 'log_detail', 'log', '[0],[system],[log],', '日志详情', '', '/log/detail', '212', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('213', 'log_clean', 'log', '[0],[system],[log],', '清空日志', null, '/log/delLog', '213', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('220', 'druid', 'system', '[0],[system],', '监控管理', null, '/druid', '220', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('230', 'dict', 'system', '[0],[system],', '字典管理', null, '/dict', '230', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('231', 'dict_list', 'dict', '[0],[system],[dict],', '字典列表', '', '/dict/list', '231', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('232', 'dict_add', 'dict', '[0],[system],[dict],', '添加字典', null, '/dict/add', '232', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('233', 'dict_update', 'dict', '[0],[system],[dict],', '修改字典', null, '/dict/update', '233', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('234', 'dict_delete', 'dict', '[0],[system],[dict],', '删除字典', null, '/dict/delete', '234', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('235', 'dict_detail', 'dict', '[0],[system],[dict],', '字典详情', '', '/dict/detail', '235', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('236', 'to_dict_edit', 'dict', '[0],[system],[dict],', '修改菜单跳转', '', '/dict/dict_edit', '236', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('240', 'notice', 'system', '[0],[system],', '通知管理', null, '/notice', '240', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('242', 'notice_add', 'notice', '[0],[system],[notice],', '添加通知', null, '/notice/add', '242', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('243', 'notice_update', 'notice', '[0],[system],[notice],', '修改通知', null, '/notice/update', '243', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('244', 'notice_delete', 'notice', '[0],[system],[notice],', '删除通知', null, '/notice/delete', '244', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('300', 'tUser_msg', '0', '[0],', '用户管理', 'fa-bars', '#', '300', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('301', 'tUser_list', 'tUser_msg', '[0],[tUser_msg],', '用户列表', 'fa-bars', '/tUser', '301', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('520', 'tNotice_mgt', '0', '[0],', '公告管理', 'fa-bars', '#', '520', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('521', 'tNotice_list', 'tNotice_mgt', '[0],[tNotice_mgt],', '公告列表', 'fa-bars', '/tNotice', '521', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('522', 'tNotice_add', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '发布公告', 'fa-bars', '/tNotice/add', '522', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('523', 'tNotice_update', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '编辑公告', 'fa-bars', '/tNotice/update', '523', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('524', 'tNotice_delete', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '删除公告', 'fa-bars', '/tNotice/delete', '524', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('530', 'tFeedback_mgt', '0', '[0],', '反馈管理', 'fa-bars', '#', '530', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('531', 'tFeedback_list', 'tFeedback_mgt', '[0],[tFeedback_mgt],', '反馈管理', 'fa-bars', '/tFeedback', '531', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('534', 'tFeedback_delete', 'tFeedback_list', '[0],[tFeedback_mgt],[tFeedback_list],', '删除反馈', 'fa-bars', '/tFeedback/delete', '534', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('535', 'tFeedback_updateState', 'tFeedback_list', '[0],[tFeedback_mgt],[tFeedback_list],', '处理反馈', 'fa-bars', '/tFeedback/updateState', '535', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('542', 'tBanner_list', 'tAppSet_mgt', '[0],[tAppSet_mgt],', 'Banner管理', 'fa-bars', '/tBanner', '542', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('543', 'tBanner_add', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '添加Banner', 'fa-bars', '/tBanner/add', '543', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('544', 'tBanner_update', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '编辑Banner', 'fa-bars', '/tBanner/update', '544', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('545', 'tBanner_delete', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '删除Banner', 'fa-bars', '/tBanner/delete', '545', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('550', 'tAppSet_mgt', '0', '[0],', 'APP管理', 'fa-bars', '#', '550', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('551', 'tAppSet_html', 'tAppSet_mgt', '[0],[tAppSet_mgt],', '协议设置', 'fa-bars', '/tAppSet/html', '551', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('560', 'tSystemSet_mgt', '0', '[0],', '系统设置', 'fa-bars', '/tSystemSet', '560', '1', '1', null, '1', null);
-
--- ----------------------------
--- Table structure for sys_notice
--- ----------------------------
-DROP TABLE IF EXISTS `sys_notice`;
-CREATE TABLE `sys_notice` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `title` varchar(255) DEFAULT NULL COMMENT '标题',
- `type` int(11) DEFAULT NULL COMMENT '类型',
- `content` text COMMENT '内容',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `creater` int(11) DEFAULT NULL COMMENT '创建人',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='通知表';
-
--- ----------------------------
--- Records of sys_notice
--- ----------------------------
-INSERT INTO `sys_notice` VALUES ('6', '世界', '10', '欢迎使用game管理系统', '2017-01-11 08:53:20', '1');
-INSERT INTO `sys_notice` VALUES ('8', '你好', null, '你好', '2017-05-10 19:28:57', '1');
-
--- ----------------------------
--- Table structure for sys_operation_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_operation_log`;
-CREATE TABLE `sys_operation_log` (
- `id` int(65) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `logtype` varchar(255) DEFAULT NULL COMMENT '日志类型',
- `logname` varchar(255) DEFAULT NULL COMMENT '日志名称',
- `userid` int(65) DEFAULT NULL COMMENT '用户id',
- `classname` varchar(255) DEFAULT NULL COMMENT '类名称',
- `method` text COMMENT '方法名称',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `succeed` varchar(255) DEFAULT NULL COMMENT '是否成功',
- `message` text COMMENT '备注',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=597 DEFAULT CHARSET=utf8 COMMENT='操作日志';
-
--- ----------------------------
--- Records of sys_operation_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_relation
--- ----------------------------
-DROP TABLE IF EXISTS `sys_relation`;
-CREATE TABLE `sys_relation` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `menuid` bigint(11) DEFAULT NULL COMMENT '菜单id',
- `roleid` int(11) DEFAULT NULL COMMENT '角色id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4871 DEFAULT CHARSET=utf8 COMMENT='角色和菜单关联表';
-
--- ----------------------------
--- Records of sys_relation
--- ----------------------------
-INSERT INTO `sys_relation` VALUES ('4661', null, '5');
-INSERT INTO `sys_relation` VALUES ('4800', '1', '1');
-INSERT INTO `sys_relation` VALUES ('4801', '100', '1');
-INSERT INTO `sys_relation` VALUES ('4802', '101', '1');
-INSERT INTO `sys_relation` VALUES ('4803', '102', '1');
-INSERT INTO `sys_relation` VALUES ('4804', '103', '1');
-INSERT INTO `sys_relation` VALUES ('4805', '104', '1');
-INSERT INTO `sys_relation` VALUES ('4806', '105', '1');
-INSERT INTO `sys_relation` VALUES ('4807', '106', '1');
-INSERT INTO `sys_relation` VALUES ('4808', '107', '1');
-INSERT INTO `sys_relation` VALUES ('4809', '108', '1');
-INSERT INTO `sys_relation` VALUES ('4810', '109', '1');
-INSERT INTO `sys_relation` VALUES ('4811', '110', '1');
-INSERT INTO `sys_relation` VALUES ('4812', '111', '1');
-INSERT INTO `sys_relation` VALUES ('4813', '120', '1');
-INSERT INTO `sys_relation` VALUES ('4814', '121', '1');
-INSERT INTO `sys_relation` VALUES ('4815', '122', '1');
-INSERT INTO `sys_relation` VALUES ('4816', '123', '1');
-INSERT INTO `sys_relation` VALUES ('4817', '124', '1');
-INSERT INTO `sys_relation` VALUES ('4818', '125', '1');
-INSERT INTO `sys_relation` VALUES ('4819', '126', '1');
-INSERT INTO `sys_relation` VALUES ('4820', '127', '1');
-INSERT INTO `sys_relation` VALUES ('4821', '130', '1');
-INSERT INTO `sys_relation` VALUES ('4822', '131', '1');
-INSERT INTO `sys_relation` VALUES ('4823', '132', '1');
-INSERT INTO `sys_relation` VALUES ('4824', '133', '1');
-INSERT INTO `sys_relation` VALUES ('4825', '134', '1');
-INSERT INTO `sys_relation` VALUES ('4826', '135', '1');
-INSERT INTO `sys_relation` VALUES ('4827', '140', '1');
-INSERT INTO `sys_relation` VALUES ('4828', '141', '1');
-INSERT INTO `sys_relation` VALUES ('4829', '142', '1');
-INSERT INTO `sys_relation` VALUES ('4830', '143', '1');
-INSERT INTO `sys_relation` VALUES ('4831', '144', '1');
-INSERT INTO `sys_relation` VALUES ('4832', '145', '1');
-INSERT INTO `sys_relation` VALUES ('4833', '146', '1');
-INSERT INTO `sys_relation` VALUES ('4834', '200', '1');
-INSERT INTO `sys_relation` VALUES ('4835', '201', '1');
-INSERT INTO `sys_relation` VALUES ('4836', '202', '1');
-INSERT INTO `sys_relation` VALUES ('4837', '210', '1');
-INSERT INTO `sys_relation` VALUES ('4838', '211', '1');
-INSERT INTO `sys_relation` VALUES ('4839', '212', '1');
-INSERT INTO `sys_relation` VALUES ('4840', '213', '1');
-INSERT INTO `sys_relation` VALUES ('4841', '220', '1');
-INSERT INTO `sys_relation` VALUES ('4842', '230', '1');
-INSERT INTO `sys_relation` VALUES ('4843', '231', '1');
-INSERT INTO `sys_relation` VALUES ('4844', '232', '1');
-INSERT INTO `sys_relation` VALUES ('4845', '233', '1');
-INSERT INTO `sys_relation` VALUES ('4846', '234', '1');
-INSERT INTO `sys_relation` VALUES ('4847', '235', '1');
-INSERT INTO `sys_relation` VALUES ('4848', '236', '1');
-INSERT INTO `sys_relation` VALUES ('4849', '240', '1');
-INSERT INTO `sys_relation` VALUES ('4850', '242', '1');
-INSERT INTO `sys_relation` VALUES ('4851', '243', '1');
-INSERT INTO `sys_relation` VALUES ('4852', '244', '1');
-INSERT INTO `sys_relation` VALUES ('4853', '300', '1');
-INSERT INTO `sys_relation` VALUES ('4854', '301', '1');
-INSERT INTO `sys_relation` VALUES ('4855', '520', '1');
-INSERT INTO `sys_relation` VALUES ('4856', '521', '1');
-INSERT INTO `sys_relation` VALUES ('4857', '522', '1');
-INSERT INTO `sys_relation` VALUES ('4858', '523', '1');
-INSERT INTO `sys_relation` VALUES ('4859', '524', '1');
-INSERT INTO `sys_relation` VALUES ('4860', '530', '1');
-INSERT INTO `sys_relation` VALUES ('4861', '531', '1');
-INSERT INTO `sys_relation` VALUES ('4862', '534', '1');
-INSERT INTO `sys_relation` VALUES ('4863', '535', '1');
-INSERT INTO `sys_relation` VALUES ('4864', '550', '1');
-INSERT INTO `sys_relation` VALUES ('4865', '542', '1');
-INSERT INTO `sys_relation` VALUES ('4866', '543', '1');
-INSERT INTO `sys_relation` VALUES ('4867', '544', '1');
-INSERT INTO `sys_relation` VALUES ('4868', '545', '1');
-INSERT INTO `sys_relation` VALUES ('4869', '551', '1');
-INSERT INTO `sys_relation` VALUES ('4870', '560', '1');
-
--- ----------------------------
--- Table structure for sys_role
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '序号',
- `pid` int(11) DEFAULT NULL COMMENT '父角色id',
- `name` varchar(255) DEFAULT NULL COMMENT '角色名称',
- `deptid` int(11) DEFAULT NULL COMMENT '部门名称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `version` int(11) DEFAULT NULL COMMENT '保留字段(暂时没用）',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='角色表';
-
--- ----------------------------
--- Records of sys_role
--- ----------------------------
-INSERT INTO `sys_role` VALUES ('1', '1', '0', '超级管理员', '24', 'administrator', '1');
-INSERT INTO `sys_role` VALUES ('5', '2', '1', '临时', '26', 'temp', null);
-
--- ----------------------------
--- Table structure for sys_user
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `avatar` varchar(255) DEFAULT NULL COMMENT '头像',
- `account` varchar(45) DEFAULT NULL COMMENT '账号',
- `password` varchar(45) DEFAULT NULL COMMENT '密码',
- `salt` varchar(45) DEFAULT NULL COMMENT 'md5密码盐',
- `name` varchar(45) DEFAULT NULL COMMENT '名字',
- `birthday` datetime DEFAULT NULL COMMENT '生日',
- `sex` int(11) DEFAULT NULL COMMENT '性别（1：男 2：女）',
- `email` varchar(45) DEFAULT NULL COMMENT '电子邮件',
- `phone` varchar(45) DEFAULT NULL COMMENT '电话',
- `roleid` varchar(255) DEFAULT NULL COMMENT '角色id',
- `deptid` int(11) DEFAULT NULL COMMENT '部门id',
- `status` int(11) DEFAULT NULL COMMENT '状态(1：启用 2：冻结 3：删除）',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `version` int(11) DEFAULT NULL COMMENT '保留字段',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COMMENT='管理员表';
-
--- ----------------------------
--- Records of sys_user
--- ----------------------------
-INSERT INTO `sys_user` VALUES ('1', 'girl.gif', 'admin', 'ecfadcde9305f8891bcfe5a1e28c253e', '8pgby', '张三', '2017-05-05 00:00:00', '2', 'sn93@qq.com', '18200000000', '1', '27', '1', '2016-01-29 08:49:53', '25');
-INSERT INTO `sys_user` VALUES ('44', null, 'test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '3', '2017-05-16 20:33:37', null);
-INSERT INTO `sys_user` VALUES ('45', null, 'boss', '71887a5ad666a18f709e1d4e693d5a35', '1f7bf', '老板', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:02', null);
-INSERT INTO `sys_user` VALUES ('46', null, 'manager', 'b53cac62e7175637d4beb3b16b2f7915', 'j3cs9', '经理', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:24', null);
-
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
index e9b1647..11a9218 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -11,6 +11,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.IInviteService;
import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import org.apache.commons.lang.time.DateUtils;
@@ -45,6 +46,9 @@
@Autowired
private ITUserService tUserService;
+
+ @Autowired
+ private ITDriverService driverService;
/**
* 跳转到用户管理首页
@@ -109,7 +113,7 @@
String nickName,
String phone,
Integer isAuth,
- Integer state,String companyName) {
+ Integer state,String companyName, String inviteUser) {
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)){
@@ -118,7 +122,8 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String, Object>> userList = tUserService.getUserList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), isAuth, state, id, nickName, phone, companyName);
+ List<Map<String, Object>> userList = tUserService.getUserList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), isAuth,
+ state, id, nickName, phone, companyName, inviteUser);
for (Map<String, Object> stringObjectMap : userList) {
String string = stringObjectMap.get("id").toString();
int i = inviteService.selectCount(new EntityWrapper<Invite>()
@@ -126,6 +131,17 @@
.eq("userType",1)
);
stringObjectMap.put("inviteNumber", i);
+ Invite invite = inviteService.selectOne(new EntityWrapper<Invite>().eq("userId", string));
+ if(null != invite){
+ String inviteUser1 = "";
+ if(1 == invite.getUserType()){
+ inviteUser1 = tUserService.selectById(invite.getInviteUserId()).getPhone();
+ }else{
+ inviteUser1 = driverService.selectById(invite.getInviteUserId()).getPhone();
+ }
+ stringObjectMap.put("inviteUser", inviteUser1);
+ }
+
}
page.setRecords(userList);
return super.packForBT(page);
@@ -544,6 +560,7 @@
shellList.add("紧急联系人电话");
shellList.add("是否实名认证");
shellList.add("历史出行次数");
+ shellList.add("邀请人");
shellList.add("邀请次数");
shellList.add("历史消费");
shellList.add("积分");
@@ -595,6 +612,11 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("inviteUser"))){
+ shellList.add(object.get("inviteUser").toString());
+ }else{
+ shellList.add("-");
+ }
if(SinataUtil.isNotEmpty(object.get("inviteNumber"))){
shellList.add(object.get("inviteNumber").toString());
}else{
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java
index 201244b..08c5cdb 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java
@@ -39,7 +39,8 @@
@Param("id") String id,
@Param("nickName") String nickName,
@Param("phone") String phone,
- @Param("companyName") String companyName);
+ @Param("companyName") String companyName,
+ @Param("inviteUser") String inviteUser);
/**
* 根据用户ID获取用户详情
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index b08b7e9..6990d57 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -46,6 +46,14 @@
LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ LEFT JOIN t_invite inv1 on (ui.id = inv1.userId and inv1.userType = 1)
+ left join t_user uu on (inv1.inviteUserId = uu.id)
+ LEFT JOIN t_invite inv2 on (ui.id = inv2.userId and inv2.userType = 2)
+ left join t_driver dd on (inv2.inviteUserId = dd.id)
+ where 1 = 1
+ <if test="inviteUser != null and inviteUser != ''">
+ and (uu.phone LIKE CONCAT('%',#{inviteUser},'%') or dd.phone LIKE CONCAT('%',#{inviteUser},'%'))
+ </if>
) as o
<where>
o.flag != 3
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
index 07e4c22..a430da1 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
@@ -34,8 +34,8 @@
/**
* 使用范围（1=用户，2=司机）
*/
- @TableField("useType")
- private Integer useType;
+ @TableField("userType")
+ private Integer userType;
@TableField(exist = false)
@ApiModelProperty("头像")
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java
index b17f1ef..a66bb5b 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java
@@ -39,7 +39,8 @@
@Param("id") String id,
@Param("nickName") String nickName,
@Param("phone") String phone,
- @Param("companyName") String companyName);
+ @Param("companyName") String companyName,
+ @Param("inviteUser") String inviteUser);
/**
* 根据用户ID获取用户详情
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java
index a38d26f..73f3721 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java
@@ -1,10 +1,16 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.Invite;
+import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.dao.TUserMapper;
+import com.stylefeng.guns.modular.system.service.IInviteService;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -20,10 +26,17 @@
*/
@Service
public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ITUserService {
+
+ @Autowired
+ private IInviteService inviteService;
+
+ @Autowired
+ private ITDriverService driverService;
@Override
- public List<Map<String, Object>> getUserList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer roleType,Integer nowUserId, Integer isAuth, Integer state, String id, String nickName,String phone,String companyName) {
- return this.baseMapper.getUserList(page, beginTime, endTime,roleType,nowUserId, isAuth, state, id, nickName,phone,companyName);
+ public List<Map<String, Object>> getUserList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer roleType,Integer nowUserId, Integer isAuth,
+ Integer state, String id, String nickName,String phone,String companyName, String inviteUser) {
+ return this.baseMapper.getUserList(page, beginTime, endTime,roleType,nowUserId, isAuth, state, id, nickName,phone,companyName, inviteUser);
}
@Override
@@ -33,7 +46,28 @@
@Override
public List<Map<String, Object>> getUserListNoPage(Integer roleType, Integer nowUserId) {
- return this.baseMapper.getUserListNoPage(roleType, nowUserId);
+ List<Map<String, Object>> userListNoPage = this.baseMapper.getUserListNoPage(roleType, nowUserId);
+ for (Map<String, Object> map : userListNoPage) {
+ String string = map.get("id").toString();
+ Invite invite = inviteService.selectOne(new EntityWrapper<Invite>().eq("userId", string));
+ if(null != invite){
+ String inviteUser1 = "";
+ if(1 == invite.getUserType()){
+ TUser tUser = this.selectById(invite.getInviteUserId());
+ if(null != tUser){
+ inviteUser1 = tUser.getPhone();
+ }
+ }else{
+ TDriver tDriver = driverService.selectById(invite.getInviteUserId());
+ if(null != tDriver){
+ inviteUser1 = tDriver.getPhone();
+ }
+ }
+ map.put("inviteUser", inviteUser1);
+ }
+ }
+
+ return userListNoPage;
}
@Override
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/application.yml b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
index 921489c..d3689f4 100644
--- a/ManagementOKTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -66,26 +66,17 @@
# password: XianNing@2024!
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
- url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# username: root
+# password: XianNing@2024!
+# db-name: guns #用来搜集数据库的所有表
+# filters: wall,mergeStat
+ url: jdbc:mysql://127.0.0.1:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
- password: XianNing@2024!
-# db-name: guns #用来搜集数据库的所有表
-# filters: wall,mergeStat
-# url: jdbc:mysql://192.168.110.34:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-# username: root
-# password: 123456
+ password: 123456
# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
-
-#spring:
-# profiles: local
-# datasource:
-# url: jdbc:mysql://127.0.0.1:3306/oktravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-# username: root
-# password: root
-# db-name: oktravel #用来搜集数据库的所有表
-# filters: wall,mergeStat
@@ -100,16 +91,6 @@
- dataSourceGuns
- dataSourceBiz
----
-
-#spring:
-# profiles: produce
-# datasource:
-# url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-# username: root
-# password: Root2020!
-# db-name: mask #用来搜集数据库的所有表
-# filters: wall,mergeStat
---
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
index a6e9ced..b714ed4 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
@@ -35,6 +35,9 @@
<option value="2">冻结</option>
</#SelectCon>
</div>
+ <div class="col-sm-3">
+ <#NameCon id="inviteUser" name="邀请人" />
+ </div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js
index 012d815..9649ddd 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js
@@ -111,6 +111,18 @@
return btn;
}
},
+ {title: '邀请人', field: 'inviteUser', visible: true, align: 'center', valign: 'middle',width:'6%',
+ formatter: function (value, row) {
+ var temp = row.id
+ var btn = "";
+ if(row.inviteUser != '' && row.inviteUser != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis" title="' + row.inviteUser + '" onfocus="TUser.tooltip()" >' + row.inviteUser + '</p>']
+ }else {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis" title="-" onfocus="TUser.tooltip()" >-</p>']
+ }
+ return btn;
+ }
+ },
{title: '邀请次数', field: 'inviteNumber', visible: true, align: 'center', valign: 'middle',width:'5%',
formatter: function (value, row) {
var temp = row.id
@@ -296,6 +308,7 @@
queryData['phone'] = $("#phone").val();
queryData['isAuth'] = $("#isAuth").val();
queryData['state'] = $("#state").val();
+ queryData['inviteUser'] = $("#inviteUser").val();
TUser.table.refresh({query: queryData});
};
TUser.resetSearch = function () {
@@ -305,6 +318,7 @@
$("#phone").val("");
$("#isAuth").val("");
$("#state").val("");
+ $("#inviteUser").val("");
TUser.search();
};
diff --git a/ManagementOKTravel/guns-rest/db/guns_rest.sql b/ManagementOKTravel/guns-rest/db/guns_rest.sql
deleted file mode 100644
index 4cc1588..0000000
--- a/ManagementOKTravel/guns-rest/db/guns_rest.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Navicat MySQL Data Transfer
-
- Source Server : localhost
- Source Server Type : MySQL
- Source Server Version : 50721
- Source Host : localhost:3306
- Source Schema : guns_rest
-
- Target Server Type : MySQL
- Target Server Version : 50721
- File Encoding : 65001
-
- Date: 26/01/2018 21:16:47
-*/
-
-DROP DATABASE IF EXISTS guns_rest;
-CREATE DATABASE IF NOT EXISTS guns_rest DEFAULT CHARSET utf8 COLLATE utf8_general_ci;
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for user
--- ----------------------------
-DROP TABLE IF EXISTS `user`;
-CREATE TABLE `user` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `userName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of user
--- ----------------------------
-INSERT INTO `user` VALUES (1, 'admin');
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
index 675c7bb..746ef5b 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -35,7 +35,13 @@
@Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
@Param("money") Double money, @Param("pageNum") Integer pageNum,
@Param("size") Integer size);
-
+
+
+ List<Map<String, Object>> queryCoupon1(@Param("uid") Integer uid, @Param("cityCode") String cityCode,
+ @Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
+ @Param("money") Double money, @Param("pageNum") Integer pageNum,
+ @Param("size") Integer size);
+
/**
* 获取优惠券列表
* @param state
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
index b253b6d..64ad6a2 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
@@ -79,9 +79,45 @@
limit #{pageNum}, #{size}
</if>
</select>
-
-
-
+
+
+
+
+ <select id="queryCoupon1" resultType="map">
+ select
+ a.id as id,
+ a.money as money,
+ a.couponUseType as userType,
+ DATE_FORMAT(a.expirationTime, '%Y-%m-%d') as time,
+ a.couponType as `type`,
+ a.fullMoney as fullMoney,
+ a.state as state,
+ b.`name` as `name`,
+ c.citys
+ from t_user_coupon_record a
+ left join t_company b on (a.companyId = b.id)
+ left join t_sys_coupon_record c on (a.couponId = c.id)
+ where a.expirationTime >= now()
+ <if test="null != uid">
+ and a.userId = #{uid}
+ </if>
+ <if test="null != cityCode and '' != cityCode">
+ and JSON_CONTAINS(c.citys, #{cityCode})
+ </if>
+ <if test="null != state">
+ and a.state = #{state}
+ </if>
+ <if test="null != couponUseType">
+ and a.couponUseType = #{couponUseType}
+ </if>
+ <if test="null != money">
+ and if(a.couponType = 1, a.money <= #{money}, a.fullMoney <= #{money})
+ </if>
+ order by a.insertTime desc
+ <if test="null != pageNum and null != size">
+ limit #{pageNum}, #{size}
+ </if>
+ </select>
@@ -94,9 +130,11 @@
a.couponType as `type`,
a.fullMoney as fullMoney,
a.state as state,
- b.`name` as `name`
+ b.`name` as `name`,
+ c.citys
from t_user_coupon_record a
left join t_company b on (a.companyId = b.id)
+ left join t_sys_coupon_record c on (a.couponId = c.id)
where 1 = 1
<if test="null != uid">
and a.userId = #{uid}
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
index 84636e8..fd79e4d 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
@@ -28,7 +28,16 @@
* @throws Exception
*/
List<Map<String, Object>> queryCoupon(Integer uid, Integer companyId, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception;
-
+
+
+
+ /**
+ * 获取优惠券列表
+ * @return
+ * @throws Exception
+ */
+ List<Map<String, Object>> queryCoupon1(Integer uid, String cityCode, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception;
+
/**
* 获取优惠券列表
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index 9e341fd..cab4212 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -1,5 +1,8 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.UserCouponRecordMapper;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
@@ -8,6 +11,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -44,8 +48,28 @@
pageNum = (pageNum - 1) * size;
return userCouponRecordMapper.queryCoupon(uid, companyId, state, couponUseType, money, pageNum, size);
}
-
-
+
+ @Override
+ public List<Map<String, Object>> queryCoupon1(Integer uid, String cityCode, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception {
+ pageNum = (pageNum - 1) * size;
+ List<Map<String, Object>> list = userCouponRecordMapper.queryCoupon1(uid, cityCode, state, couponUseType, money, pageNum, size);
+ for (Map<String, Object> map : list) {
+ Object citys = map.get("citys");
+ if(null != citys){
+ List<String> names = new ArrayList<>();
+ String s = citys.toString();
+ JSONArray jsonArray = JSON.parseArray(s);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ String name = jsonObject.getString("name");
+ names.add(name);
+ }
+ map.put("citys", JSON.toJSONString(names));
+ }
+ }
+ return list;
+ }
+
/**
* 获取优惠券列表
* @param state
@@ -58,7 +82,22 @@
@Override
public List<Map<String, Object>> queryMyCoupons(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception {
pageNum = (pageNum - 1) * size;
- return userCouponRecordMapper.queryMyCoupons(state, pageNum, size, uid);
+ List<Map<String, Object>> list = userCouponRecordMapper.queryMyCoupons(state, pageNum, size, uid);
+ for (Map<String, Object> map : list) {
+ Object citys = map.get("citys");
+ if(null != citys){
+ List<String> names = new ArrayList<>();
+ String s = citys.toString();
+ JSONArray jsonArray = JSON.parseArray(s);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ String name = jsonObject.getString("name");
+ names.add(name);
+ }
+ map.put("citys", JSON.toJSONString(names));
+ }
+ }
+ return list;
}
/**
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CouponWarpper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CouponWarpper.java
index 0ffad5a..5be4999 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CouponWarpper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CouponWarpper.java
@@ -25,6 +25,8 @@
private String name;
@ApiModelProperty("状态（1=未使用，2=已使用，3=已过期）")
private Integer state;
+ @ApiModelProperty("适用城市")
+ private String city;
public Integer getId() {
return id;
@@ -89,7 +91,15 @@
public void setState(Integer state) {
this.state = state;
}
-
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
@Override
public String toString() {
return "CouponWarpper{" +
@@ -116,6 +126,7 @@
couponWarpper.setFullMoney(null != map.get("fullMoney") ? Double.valueOf(String.valueOf(map.get("fullMoney"))) : 0);
couponWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
couponWarpper.setState(null != map.get("state") ? Integer.valueOf(String.valueOf(map.get("state"))) : 0);
+ couponWarpper.setCity(null != map.get("citys") ? String.valueOf(map.get("citys")) : "");
list.add(couponWarpper);
}
}
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 4f9bf9f..ee538fd 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -256,11 +256,6 @@
warpper.setStartLon(orderTaxi.getStartLon());
warpper.setEndLat(orderTaxi.getEndLat());
warpper.setEndLon(orderTaxi.getEndLon());
- ResultUtil<Double> forecastPrice = getForecastPrice(warpper);
- if(forecastPrice.getCode() != 200){
- return ResultUtil.error(forecastPrice.getMsg());
- }
- orderTaxi.setOrderMoney(forecastPrice.getData());
if (!StringUtils.hasLength(orderTaxi.getPassengers()) || StringUtils.hasLength(orderTaxi.getPassengersPhone()) ){
// 如果没有填写乘车人电话或者姓名 那么用用户的
@@ -830,8 +825,22 @@
@Override
public List<Map<String, Object>> queryCoupon(Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
- List<Map<String, Object>> list = userCouponRecordService.queryCoupon(uid, null, 1, 2, orderTaxi.getOrderMoney(), pageNum, size);
- List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(uid, null, 1, 0, orderTaxi.getOrderMoney(), pageNum, size);
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+ Integer companyId = driver.getCompanyId();
+ List<CompanyCity> companyCityList = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("companyId", companyId));
+ List<Map<String, Integer>> cityCode = new ArrayList<>();
+ for (CompanyCity companyCity : companyCityList) {
+ Map<String, Integer> city = new HashMap<>();
+ if(ToolUtil.isNotEmpty(companyCity.getAreaCode())){
+ city.put("code", Integer.valueOf(companyCity.getAreaCode()));
+ }else if(ToolUtil.isEmpty(companyCity.getAreaCode()) && ToolUtil.isNotEmpty(companyCity.getCityCode())){
+ city.put("code", Integer.valueOf(companyCity.getCityCode()));
+ }else if(ToolUtil.isEmpty(companyCity.getCityCode()) && ToolUtil.isNotEmpty(companyCity.getProvinceCode())){
+ city.put("code", Integer.valueOf(companyCity.getProvinceCode()));
+ }
+ }
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon1(uid, JSON.toJSONString(cityCode), 1, 2, orderTaxi.getOrderMoney(), pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon1(uid, JSON.toJSONString(cityCode), 1, 0, orderTaxi.getOrderMoney(), pageNum, size);
list.addAll(list1);
return list;
}
@@ -1526,6 +1535,10 @@
systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功完成出行订单支付，谢谢使用！", orderTaxi.getUserId(), 1);
+ //添加司机消息提醒
+ systemNoticeService.addSystemNotice(2, "用户已线上完成支付", driver.getId(), 1);
+ //推送状态，让司机端播报语音
+ pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
--
Gitblit v1.7.1