From 3d00fa32affba29c7862dca8fc60b32ba1ee74c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Mar 2021 14:42:01 +0800
Subject: [PATCH] 20210226 分销设置页
---
zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java | 2
zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java | 13 ++
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | 249 +++++++++++++++++++++++++++++++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 4
zq-erp/src/main/java/com/matrix/component/rabbitmq/MqTask.java | 8
zq-erp/src/main/resources/templates/views/admin/score/score-setting.html | 2
6 files changed, 272 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
index 92049f8..c07c57a 100644
--- a/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
+++ b/zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java
@@ -181,6 +181,11 @@
*/
private Integer isSales;
+ /**
+ * 用户类型 1、待审核 2、审核通过 0、审核未通过
+ */
+ private Integer fenxiaoState;
+
/**
* 开始时间
@@ -476,4 +481,12 @@
public void setIsSales(Integer isSales) {
this.isSales = isSales;
}
+
+ public Integer getFenxiaoState() {
+ return fenxiaoState;
+ }
+
+ public void setFenxiaoState(Integer fenxiaoState) {
+ this.fenxiaoState = fenxiaoState;
+ }
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
index 887b2b2..d477acc 100644
--- a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
+++ b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
@@ -1,4 +1,4 @@
-package com.matrix.core.rabbitmq;
+package com.matrix.component.rabbitmq;
import com.matrix.core.exception.GlobleExceptionResolver;
import com.matrix.core.tools.LogUtil;
diff --git a/zq-erp/src/main/java/com/matrix/component/rabbitmq/MqTask.java b/zq-erp/src/main/java/com/matrix/component/rabbitmq/MqTask.java
index 2745b5e..eafb7c2 100644
--- a/zq-erp/src/main/java/com/matrix/component/rabbitmq/MqTask.java
+++ b/zq-erp/src/main/java/com/matrix/component/rabbitmq/MqTask.java
@@ -26,7 +26,7 @@
/**
* 处理类在spring中的bean名称
*/
- private com.matrix.core.rabbitmq.DeliverCallbackAdapter handerAdapter;
+ private DeliverCallbackAdapter handerAdapter;
/**
* 自动确认 默认为true
@@ -39,7 +39,7 @@
this.queue = queue;
this.routingKey = routingKey;
if(hander!=null){
- this.handerAdapter = new com.matrix.core.rabbitmq.DeliverCallbackAdapter(hander,routingKey);
+ this.handerAdapter = new DeliverCallbackAdapter(hander,routingKey);
}
}
@@ -48,7 +48,7 @@
this.queue = queue;
this.routingKey = routingKey;
if(hander!=null){
- this.handerAdapter = new com.matrix.core.rabbitmq.DeliverCallbackAdapter(hander,routingKey);
+ this.handerAdapter = new DeliverCallbackAdapter(hander,routingKey);
}
this.autoAck=autoAck;
@@ -95,7 +95,7 @@
return handerAdapter;
}
- public void setHander(com.matrix.core.rabbitmq.DeliverCallbackAdapter hander) {
+ public void setHander(DeliverCallbackAdapter hander) {
this.handerAdapter = hander;
}
}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
index 6060596..cf487c7 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
@@ -1,5 +1,6 @@
package com.matrix.system.fenxiao.action;
+import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
@@ -41,6 +42,9 @@
@Autowired
private ShoppingGoodsDao shoppingGoodsDao;
+
+ @Autowired
+ private BizUserDao bizUserDao;
/**
*查询分销配置
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
new file mode 100644
index 0000000..72e9204
--- /dev/null
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -0,0 +1,249 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
+<head>
+ <meta charset="utf-8">
+ <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+ <meta name="renderer" content="webkit|ie-comp|ie-stand">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+ <meta http-equiv="Cache-Control" content="no-siteapp"/>
+ <!-- 本框架基本脚本和样式 -->
+ <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
+ <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
+ <link rel="stylesheet" th:href="@{/plugin/bootstrap-3.3.5/css/bootstrap.min.css}">
+ <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
+
+ <!-- 富文本编辑器 -->
+ <script type="text/javascript" charset="utf-8"
+ th:src="@{/plugin/beditor/ueditor.config.js}"></script>
+ <script type="text/javascript" charset="utf-8"
+ th:src="@{/plugin/beditor/ueditor.all.js}">
+ </script>
+ <script type="text/javascript" charset="utf-8"
+ th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>
+</head>
+
+<body>
+<div class="ibox-content" id="app" v-cloak>
+ <el-form label-width="120px" >
+ <el-row>
+ <el-tabs v-model="activeName" >
+ <el-tab-pane label="门店积分规则" name="first">
+ <form class="form-inline" id="serchform">
+ <el-row style="display:flex;align-items: center;">
+ <el-col>
+ <el-button type="primary" @click="submits()">新增分销员</el-button>
+ </el-col>
+ <el-col style="display:flex;align-items: center;">
+ <el-select v-model="shenheState" placeholder="审核状态">
+ <el-option label="已审核" value="1"></el-option>
+ <el-option label="未审核" value="2"></el-option>
+ </el-select>
+ <el-select v-model="fenxiaoGrade" placeholder="分销员等级">
+ <el-option label="初始等级" value="1"></el-option>
+ <el-option label="合伙人" value="2"></el-option>
+ </el-select>
+ <el-button type="primary" @click="submits()">搜索</el-button>
+ <el-button type="primary" @click="submits()">重置</el-button>
+ </el-col>
+ </el-row>
+ </form>
+ <template>
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="分销员姓名"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="分销员姓名"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="邀请人"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="下级客户数"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="累计收益"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="待结算"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="等级"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="加入时间"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="状态"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="来源"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="操作"
+ width="100">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+ <el-button type="text" size="small">编辑</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-tab-pane>
+ <el-tab-pane label="分佣方案" name="second">
+ <template>
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ height="250">
+ <el-table-column
+ prop="name"
+ label="方案名称"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="推广提成%"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="邀请提成 %"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="等级条件（推广金额额）"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="操作"
+ width="100">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+ <el-button type="text" size="small">编辑</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-tab-pane>
+ <el-tab-pane label="推广文案" name="third">
+ <el-row>
+ <script style="width: 100%; height: 500px" id="description" name="description"
+ type="text/plain"></script>
+ </el-row>
+ <el-row justify="center" type="flex">
+ <el-button type="primary" @click="submit()">保存</el-button>
+ </el-row>
+ </el-tab-pane>
+ </el-tabs>
+ </el-row>
+ </el-form>
+</div>
+</body>
+<script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+<script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script>
+<script type="text/javascript" th:src="@{/plugin/bootstrap-3.3.5/js/bootstrap.min.js}"></script>
+<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
+<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
+<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
+
+<script>
+ //百度编辑器
+ var ue = {};
+ var app = new Vue({
+ el: '#app',
+ data: {
+ shenheState: "",
+ fenxiaoGrade: "",
+ tgwa: "",
+ activeName: 'first',
+ multipleSelection: [],
+ jfyxq:[],
+ jfdxj:[],
+ mdjf:[],
+ scjf:[],
+ },
+ created: function () {
+ this.loadInfo();
+ //初始化编辑器
+ ue = UE.getEditor('description');
+ },
+ mounted: function () {
+ },
+ methods: {
+ //加载分类
+ loadInfo() {
+ let _this = this;
+ _this.loadParamSetting();
+ },
+ toggleSelection(rows) {
+ if (rows) {
+ rows.forEach(row => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ handleSelectionChange(val) {
+ this.multipleSelection = val;
+ },
+ handleClick(row) {
+ console.log(row);
+ },
+ loadParamSetting() {
+ let _this = this;
+ //加载配置
+ AjaxProxy.requst({
+ app: _this,
+ data: {},
+ url: basePath + '/score/ruleSetting/selectScoreRule',
+ callback: function (data) {
+ _this.jfyxq = data.mapInfo.jfyxq;
+ console.log("over");
+ }
+ });
+ },
+
+ submit() {
+ }
+ }
+ })
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/score/score-setting.html b/zq-erp/src/main/resources/templates/views/admin/score/score-setting.html
index 7e526bf..aa220f9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/score/score-setting.html
+++ b/zq-erp/src/main/resources/templates/views/admin/score/score-setting.html
@@ -57,7 +57,7 @@
<el-option label="3年后" value="4"></el-option>
<el-option label="4年后" value="5"></el-option>
<el-option label="5年后" value="6"></el-option>
- </el-select>
+ </el-select>
</el-col>
<el-col :span="2" style="margin-left: 10px;display: flex;align-items: center;height: 40px">
<el-tooltip class="item" effect="dark" content="设置为“1年后”，表示在今年获得的用户积分将在明年的12月31号23：59：59失效，以此类推" placement="top">
--
Gitblit v1.9.1