| zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java | ●●●●● patch | view | raw | blame | history | |
| zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | ●●●●● patch | view | raw | blame | history |
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
New file @@ -0,0 +1,60 @@ package com.matrix.system.fenxiao.action; import com.matrix.core.anotations.RemoveRequestToken; import com.matrix.core.constance.MatrixConstance; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.hive.bean.ShoppingGoods; import com.matrix.system.hive.bean.SysShopInfo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant; import com.matrix.system.fenxiao.service.FenXiaoSettingService; import com.matrix.system.fenxiao.service.ShopSalesmanApplyService; import com.matrix.system.fenxiao.vo.FenXiaoSettingVo; import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @RestController @RequestMapping(value = "/fenXiao/fenXiaoUser") public class FenXiaoUserAction { @Autowired private ShopSalesmanApplyService shopSalesmanApplyService; /** * 修改公司维度的分销规则 */ // @PostMapping(value = "/fxImgUpload") // public @ResponseBody // AjaxResult updateFenXiaoSetting(@RequestBody BusParameterSettings busParameterSettings) { // return fenXiaoSettingService.updateFenXiaoSettingByCompanyId(busParameterSettings); // } /** *获取分销员审核记录 */ @RequestMapping(value = "/fenXiaoUserApply") public AjaxResult selectFenXiaoUserApply() { AjaxResult result= AjaxResult.buildSuccessInstance("查询成功"); SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); Long companyId = user.getCompanyId(); //分销员审核记录 List<ShopSalesmanApplyVo> shopSalesmanApplyVos = shopSalesmanApplyService.selectFenXiaoUserApplyByCompanyId(companyId); result.putInMap("fxshjl", shopSalesmanApplyVos); return result; } } zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -1,7 +1,10 @@ package com.matrix.system.fenxiao.dao; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.matrix.system.fenxiao.entity.ShopSalesmanApply; import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo; /** * @description 推广员申请记录 @@ -10,4 +13,6 @@ */ public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> { List<ShopSalesmanApplyVo> selectFenXiaoUserApplyByCompanyId(@Param("companyId")Long companyId); } zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -5,18 +5,24 @@ import com.matrix.biz.bean.BizUser; import com.matrix.biz.dao.BizUserDao; import com.matrix.biz.service.BizUserService; import com.matrix.core.constance.MatrixConstance; import com.matrix.core.exception.GlobleException; import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.common.interceptor.HostInterceptor; import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant; import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao; import com.matrix.system.fenxiao.entity.ShopSalesmanApply; import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; /** * @description 推广员申请记录 @@ -90,4 +96,11 @@ } } public List<ShopSalesmanApplyVo> selectFenXiaoUserApplyByCompanyId(Long companyId) { //获取当前登录人员信息 SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); List<ShopSalesmanApplyVo> shopSalesmanApplyVos = salesmanApplyDao.selectFenXiaoUserApplyByCompanyId(companyId); return shopSalesmanApplyVos; } } zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
New file @@ -0,0 +1,87 @@ package com.matrix.system.fenxiao.vo; import java.math.BigDecimal; import java.util.Date; import com.matrix.core.anotations.Extend; import io.swagger.annotations.ApiModelProperty; public class ShopSalesmanApplyVo { @Extend private static final long serialVersionUID = 1L; /** * 审核状态-1、待审核 */ public static final int APPLY_STATUS_DSH = 1; /** * 审核状态-2通过 */ public static final int APPLY_STATUS_TG= 2; /** * 审核状态-3未通过 */ public static final int APPLY_STATUS_WTG = 3; /** * 申请方式1、自主申请 */ public static final int APPLY_WAY_SELF=1; /** * 申请方式2、自动添加 */ public static final int APPLY_WAY_AUTO_ADD=2; /** * 申请方式3上级邀请 */ public static final int APPLY_WAY_INVITATION=3; /** * 申请方式 4、手动添加 */ public static final int APPLY_WAY_HAND_ADD=4; @ApiModelProperty(value = "申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加(来源)") private Integer applyWay; @ApiModelProperty(value = "申请用户id") private String userId; @ApiModelProperty(value = "邀请用户ID") private String parentUserId; @ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过") private Integer applyStatus; @ApiModelProperty(value = "备注") private String remark; /** * 公司ID */ @ApiModelProperty(hidden = true) private Long companyId; @ApiModelProperty(value = "分销员") private String nickname; @ApiModelProperty(value = "邀请人") private String parentUser; @ApiModelProperty(value = "下级客户数") private Integer lowerLevelNum; @ApiModelProperty(value = "累计收益") private BigDecimal totalRevenue; @ApiModelProperty(value = "待结算") private BigDecimal balance; @ApiModelProperty(value = "等级") private String grade; @ApiModelProperty(value = "加入时间") private Date createTime; @ApiModelProperty(value = "状态") private Integer state; } zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -26,33 +26,59 @@ <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-tab-pane label="分销员管理" name="first"> <el-row> <el-form ref="form" :model="form" inline > <el-form-item label="交易类型" prop="fenxiaoGrade"> <el-select v-model="form.fenxiaoGrade" placeholder="请选择"> <el-option v-for="item in fenxiaoGradeList" :key="item.value" :label="item.label" :value="item.value" > </el-option> </el-select> </el-form-item> <el-form-item label="分销员等级" prop="shenheState"> <el-select v-model="form.shenheState" placeholder="请选择"> <el-option v-for="item in shenheStateList" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> <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="search" >搜索</el-button> <el-button type="primary" @click="submits()">搜索</el-button> <el-button type="primary" @click="submits()">重置</el-button> <el-button @click="resetForm('form')">重置</el-button> </el-col> </el-row> </form> <el-button type="primary" @click="search" >搜索</el-button> <el-button @click="resetForm('form')">重置</el-button> </el-form> </el-row> <template> <el-table ref="multipleTable" :data="tableData" :data="fxy" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange"> @@ -169,9 +195,29 @@ <el-button type="primary" @click="submit()">保存</el-button> </el-row> </el-tab-pane> <el-tab-pane label="分享图片上传" name="fourth"> <el-row> <div class="ibox-content"> <form class="form-horizontal" id="dataform" onsubmit="javascripr:return false;"> <div class="form-group"> <label class="col-sm-2 control-label">门店照片</label> <div class="col-sm-8"> <input autocomplete="off" v-model="fxtp.paramValue" name="shopImag" id="info6" class="form-control upload-input" type="text" /> <a class="btn btn-primary radius upload-a">选择图片 </a> </div> </div> <el-row justify="center" type="flex"> <el-button type="primary" @click="submittp(paramValue)">保存</el-button> </el-row> </form> </div> </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> @@ -180,27 +226,61 @@ <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 type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script> <script> //百度编辑器 MUI.initImgUpload(".upload-input"); var ue = {}; var app = new Vue({ el: '#app', data: { fxy:[], shenheState: "", fenxiaoGrade: "", tableData:[], tgwa: "", activeName: 'first', multipleSelection: [], jfyxq:[], fxtp:{}, jfdxj:[], mdjf:[], scjf:[], form:{ name:null, datetimeArr:'', payMethod:'', flowType:'', orderNo:'', oprationMan:'', queryKey:'', order:'', sort:'' }, //条件查询审核状态 shenheStateList:[ {value:'',label:'全部'}, {value:'1',label:'已审核'}, {value:'2',label:'未审核'}, {value:'3',label:'未通过'} ], shenheStateList:[ {value:'',label:'全部'}, {value:'1',label:'已审核'}, {value:'2',label:'未审核'}, {value:'3',label:'未通过'} ], }, created: function () { this.loadInfo(); //初始化编辑器 ue = UE.getEditor('description'); //百度编辑器 MUI.initImgUpload(".upload-input"); }, mounted: function () { }, @@ -209,6 +289,9 @@ loadInfo() { let _this = this; _this.loadParamSetting(); }, submittp(paramValue) { alert(paramValue); }, toggleSelection(rows) { if (rows) { @@ -231,9 +314,8 @@ AjaxProxy.requst({ app: _this, data: {}, url: basePath + '/score/ruleSetting/selectScoreRule', url: basePath + '/score/fenXiaoUser/fenXiaoUser', callback: function (data) { _this.jfyxq = data.mapInfo.jfyxq; console.log("over"); } });
