This commit is contained in:
huangdeliang 2020-09-22 22:00:34 +08:00
parent b96af4bcbe
commit d89d17cbb3
10 changed files with 627 additions and 181 deletions

25
pom.xml
View File

@ -180,28 +180,6 @@
<version>${ruoyi.version}</version>
</dependency>
<!-- DatatypeConverter -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -215,9 +193,6 @@
</modules>
<packaging>pom</packaging>
<dependencies></dependencies>
<build>
<plugins>
<plugin>

View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
@ -49,7 +47,7 @@
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<!-- Mysql驱动包 -->
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@ -73,6 +71,30 @@
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- Java 6 = JAX-B Version 2.0 -->
<!-- Java 7 = JAX-B Version 2.2.3 -->
<!-- Java 8 = JAX-B Version 2.2.8 -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>
@ -100,7 +122,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>

View File

@ -1,9 +1,3 @@
/*
* @Description:
* @Author: huangdeliang
* @Date: 2020-09-21 11:32:59
* @LastEditors: huangdeliang
*/
package com.ruoyi;
import org.springframework.boot.SpringApplication;

View File

@ -1,11 +1,11 @@
# 项目相关配置
ruoyi:
# 名称
name: RuoYi
name: Ruoyi
# 版本
version: 3.1.0
# 版权年份
copyrightYear: 2019
copyrightYear: 2020
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath

View File

@ -1,7 +1,7 @@
# 代码生成
gen:
# 作者
author: ruoyi
author: wonder
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName: com.ruoyi.system
# 自动去除表前缀默认是false

View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询销售订单列表
export function listOrder(query) {
return request({
url: '/system/order/list',
method: 'get',
params: query
})
}
// 查询销售订单详细
export function getOrder(orderId) {
return request({
url: '/system/order/' + orderId,
method: 'get'
})
}
// 新增销售订单
export function addOrder(data) {
return request({
url: '/system/order',
method: 'post',
data: data
})
}
// 修改销售订单
export function updateOrder(data) {
return request({
url: '/system/order',
method: 'put',
data: data
})
}
// 删除销售订单
export function delOrder(orderId) {
return request({
url: '/system/order/' + orderId,
method: 'delete'
})
}
// 导出销售订单
export function exportOrder(query) {
return request({
url: '/system/order/export',
method: 'get',
params: query
})
}

View File

@ -95,7 +95,7 @@ export default {
series: [{
name: 'expected', itemStyle: {
normal: {
color: '#FF005A',
color: '#ff005a',
lineStyle: {
color: '#FF005A',
width: 2

View File

@ -0,0 +1,358 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户昵称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="金额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入金额"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成交日期" prop="saleTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="queryParams.saleTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择成交日期">
</el-date-picker>
</el-form-item>
<el-form-item label="销售渠道ID" prop="channelId">
<el-select v-model="queryParams.channelId" placeholder="请选择销售渠道ID" clearable size="small">
<el-option
v-for="dict in channelIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:order:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="orderId" />
<el-table-column label="用户ID" align="center" prop="userId" />
<el-table-column label="用户昵称" align="center" prop="nickName" />
<el-table-column label="金额" align="center" prop="amount" />
<el-table-column label="成交日期" align="center" prop="saleTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.saleTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="销售渠道ID" align="center" prop="channelId" :formatter="channelIdFormat" />
<el-table-column label="创建者" align="center" prop="createBy" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改销售订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
</el-form-item>
<el-form-item label="成交日期" prop="saleTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.saleTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择成交日期">
</el-date-picker>
</el-form-item>
<el-form-item label="销售渠道ID" prop="channelId">
<el-select v-model="form.channelId" placeholder="请选择销售渠道ID">
<el-option
v-for="dict in channelIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/system/order";
export default {
name: "Order",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
orderList: [],
//
title: "",
//
open: false,
// ID
channelIdOptions: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
nickName: null,
amount: null,
saleTime: null,
channelId: null,
},
//
form: {},
//
rules: {
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
channelId: [
{ required: true, message: "销售渠道ID不能为空", trigger: "change" }
],
}
};
},
created() {
this.getList();
this.getDicts("sys_sale_channel").then(response => {
this.channelIdOptions = response.data;
});
},
methods: {
/** 查询销售订单列表 */
getList() {
this.loading = true;
listOrder(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// ID
channelIdFormat(row, column) {
return this.selectDictLabel(this.channelIdOptions, row.channelId);
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
orderId: null,
userId: null,
nickName: null,
amount: null,
saleTime: null,
channelId: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加销售订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const orderId = row.orderId || this.ids
getOrder(orderId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改销售订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.orderId != null) {
updateOrder(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addOrder(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const orderIds = row.orderId || this.ids;
this.$confirm('是否确认删除销售订单编号为"' + orderIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delOrder(orderIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有销售订单数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportOrder(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}
}
};
</script>

View File

@ -8,7 +8,7 @@ function resolve(dir) {
const name = defaultSettings.title || '管理系统' // 标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
const port = process.env.port || process.env.npm_config_port || 8100 // 端口
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions

View File

@ -459,6 +459,7 @@ insert into sys_dict_type values(7, '通知类型', 'sys_notice_type', '0',
insert into sys_dict_type values(8, '通知状态', 'sys_notice_status', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '通知状态列表');
insert into sys_dict_type values(9, '操作类型', 'sys_oper_type', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '操作类型列表');
insert into sys_dict_type values(10, '系统状态', 'sys_common_status', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '登录状态列表');
insert into sys_dict_type values(11, '销售渠道', 'sys_sale_channel', '0', 'admin', '2020-09-22 17-33-00', 'ry', '2020-09-22 17-33-00', '登录状态列表');
-- ----------------------------
@ -512,6 +513,7 @@ insert into sys_dict_data values(25, 8, '生成代码', '8', 'sys_oper_ty
insert into sys_dict_data values(26, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作');
insert into sys_dict_data values(27, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态');
insert into sys_dict_data values(28, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态');
insert into sys_dict_data values(29, 1, '微信', '0', 'sys_sale_channel', '', '', 'Y', '0', 'admin', '2020-09-22 17-33-00', 'ry', '2020-09-22 17-33-00', '销售渠道');
-- ----------------------------
@ -679,3 +681,45 @@ create table gen_table_column (
update_time datetime comment '更新时间',
primary key (column_id)
) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
-- ----------------------------
-- 20、分成比例业务表字段
-- ----------------------------
drop table if exists sys_commision;
create table sys_commision (
rule_id bigint(20) not null auto_increment comment '编号',
user_id bigint(20) comment '用户ID',
nick_name varchar(30) not null comment '用户昵称',
amount int comment '金额',
rate int comment '分成比例',
create_by varchar(64) default '' comment '创建者',
create_time datetime comment '创建时间',
update_by varchar(64) default '' comment '更新者',
update_time datetime comment '更新时间',
remark varchar(500) default null comment '备注',
primary key (rule_id)
) engine=innodb auto_increment=1 comment = '业务提成比例表';
-- ----------------------------
-- 21、订单业务表字段
-- ----------------------------
drop table if exists sys_order;
create table sys_order (
order_id bigint(20) not null auto_increment comment '编号',
user_id bigint(20) comment '用户ID',
nick_name varchar(30) not null comment '用户昵称',
amount int comment '金额',
sale_time datetime comment '成交日期',
channel_id bigint(20) comment '销售渠道ID',
create_by varchar(64) default '' comment '创建者',
create_time datetime comment '创建时间',
update_by varchar(64) default '' comment '更新者',
update_time datetime comment '更新时间',
remark varchar(500) default null comment '备注',
primary key (order_id)
) engine=innodb auto_increment=1 comment = '销售订单表';