diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index a854d9fdf..6be174e73 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -94,6 +94,12 @@ activation 1.1.1 + + com.ruoyi + ruoyi-custom + 3.1.0 + compile + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java new file mode 100644 index 000000000..5fe5ccd3b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java @@ -0,0 +1,103 @@ +package com.ruoyi.web.controller.custom; + +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.custom.domain.SysCommision; +import com.ruoyi.custom.service.ISysCommisionService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 业务提成比例Controller + * + * @author wonder + * @date 2020-09-24 + */ +@RestController +@RequestMapping("/custom/commision") +public class SysCommisionController extends BaseController +{ + @Autowired + private ISysCommisionService sysCommisionService; + + /** + * 查询业务提成比例列表 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:list')") + @GetMapping("/list") + public TableDataInfo list(SysCommision sysCommision) + { + startPage(); + List list = sysCommisionService.selectSysCommisionList(sysCommision); + return getDataTable(list); + } + + /** + * 导出业务提成比例列表 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:export')") + @Log(title = "业务提成比例", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysCommision sysCommision) + { + List list = sysCommisionService.selectSysCommisionList(sysCommision); + ExcelUtil util = new ExcelUtil(SysCommision.class); + return util.exportExcel(list, "commision"); + } + + /** + * 获取业务提成比例详细信息 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:query')") + @GetMapping(value = "/{ruleId}") + public AjaxResult getInfo(@PathVariable("ruleId") Long ruleId) + { + return AjaxResult.success(sysCommisionService.selectSysCommisionById(ruleId)); + } + + /** + * 新增业务提成比例 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:add')") + @Log(title = "业务提成比例", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysCommision sysCommision) + { + return toAjax(sysCommisionService.insertSysCommision(sysCommision)); + } + + /** + * 修改业务提成比例 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:edit')") + @Log(title = "业务提成比例", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysCommision sysCommision) + { + return toAjax(sysCommisionService.updateSysCommision(sysCommision)); + } + + /** + * 删除业务提成比例 + */ + @PreAuthorize("@ss.hasPermi('custom:commision:remove')") + @Log(title = "业务提成比例", businessType = BusinessType.DELETE) + @DeleteMapping("/{ruleIds}") + public AjaxResult remove(@PathVariable Long[] ruleIds) + { + return toAjax(sysCommisionService.deleteSysCommisionByIds(ruleIds)); + } +} diff --git a/ruoyi-custom/pom.xml b/ruoyi-custom/pom.xml index c11ec1aad..a7ed1b730 100644 --- a/ruoyi-custom/pom.xml +++ b/ruoyi-custom/pom.xml @@ -11,5 +11,17 @@ ruoyi-custom + + 自定义模块 + + + + + + com.ruoyi + ruoyi-common + + + \ No newline at end of file diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java new file mode 100644 index 000000000..615ab27b7 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java @@ -0,0 +1,97 @@ +package com.ruoyi.custom.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 业务提成比例对象 sys_commision + * + * @author wonder + * @date 2020-09-24 + */ +public class SysCommision extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long ruleId; + + /** 业务员 */ + private Long userId; + + /** 业务员 */ + @Excel(name = "业务员") + private String nickName; + + /** 金额 */ + @Excel(name = "金额") + private Long amount; + + /** 分成比例 */ + @Excel(name = "分成比例") + private Long rate; + + public void setRuleId(Long ruleId) + { + this.ruleId = ruleId; + } + + public Long getRuleId() + { + return ruleId; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setNickName(String nickName) + { + this.nickName = nickName; + } + + public String getNickName() + { + return nickName; + } + public void setAmount(Long amount) + { + this.amount = amount; + } + + public Long getAmount() + { + return amount; + } + public void setRate(Long rate) + { + this.rate = rate; + } + + public Long getRate() + { + return rate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("ruleId", getRuleId()) + .append("userId", getUserId()) + .append("nickName", getNickName()) + .append("amount", getAmount()) + .append("rate", getRate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysCommisionMapper.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysCommisionMapper.java new file mode 100644 index 000000000..a495fcd96 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysCommisionMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.custom.mapper; + +import java.util.List; +import com.ruoyi.custom.domain.SysCommision; + +/** + * 业务提成比例Mapper接口 + * + * @author wonder + * @date 2020-09-24 + */ +public interface SysCommisionMapper +{ + /** + * 查询业务提成比例 + * + * @param ruleId 业务提成比例ID + * @return 业务提成比例 + */ + public SysCommision selectSysCommisionById(Long ruleId); + + /** + * 查询业务提成比例列表 + * + * @param sysCommision 业务提成比例 + * @return 业务提成比例集合 + */ + public List selectSysCommisionList(SysCommision sysCommision); + + /** + * 新增业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + public int insertSysCommision(SysCommision sysCommision); + + /** + * 修改业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + public int updateSysCommision(SysCommision sysCommision); + + /** + * 删除业务提成比例 + * + * @param ruleId 业务提成比例ID + * @return 结果 + */ + public int deleteSysCommisionById(Long ruleId); + + /** + * 批量删除业务提成比例 + * + * @param ruleIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysCommisionByIds(Long[] ruleIds); +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysCommisionService.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysCommisionService.java new file mode 100644 index 000000000..3bdae6b75 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysCommisionService.java @@ -0,0 +1,61 @@ +package com.ruoyi.custom.service; + +import java.util.List; +import com.ruoyi.custom.domain.SysCommision; + +/** + * 业务提成比例Service接口 + * + * @author wonder + * @date 2020-09-24 + */ +public interface ISysCommisionService +{ + /** + * 查询业务提成比例 + * + * @param ruleId 业务提成比例ID + * @return 业务提成比例 + */ + public SysCommision selectSysCommisionById(Long ruleId); + + /** + * 查询业务提成比例列表 + * + * @param sysCommision 业务提成比例 + * @return 业务提成比例集合 + */ + public List selectSysCommisionList(SysCommision sysCommision); + + /** + * 新增业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + public int insertSysCommision(SysCommision sysCommision); + + /** + * 修改业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + public int updateSysCommision(SysCommision sysCommision); + + /** + * 批量删除业务提成比例 + * + * @param ruleIds 需要删除的业务提成比例ID + * @return 结果 + */ + public int deleteSysCommisionByIds(Long[] ruleIds); + + /** + * 删除业务提成比例信息 + * + * @param ruleId 业务提成比例ID + * @return 结果 + */ + public int deleteSysCommisionById(Long ruleId); +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysCommisionServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysCommisionServiceImpl.java new file mode 100644 index 000000000..fc24a27a6 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysCommisionServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.custom.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.custom.mapper.SysCommisionMapper; +import com.ruoyi.custom.domain.SysCommision; +import com.ruoyi.custom.service.ISysCommisionService; + +/** + * 业务提成比例Service业务层处理 + * + * @author wonder + * @date 2020-09-24 + */ +@Service +public class SysCommisionServiceImpl implements ISysCommisionService +{ + @Autowired + private SysCommisionMapper sysCommisionMapper; + + /** + * 查询业务提成比例 + * + * @param ruleId 业务提成比例ID + * @return 业务提成比例 + */ + @Override + public SysCommision selectSysCommisionById(Long ruleId) + { + return sysCommisionMapper.selectSysCommisionById(ruleId); + } + + /** + * 查询业务提成比例列表 + * + * @param sysCommision 业务提成比例 + * @return 业务提成比例 + */ + @Override + public List selectSysCommisionList(SysCommision sysCommision) + { + return sysCommisionMapper.selectSysCommisionList(sysCommision); + } + + /** + * 新增业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + @Override + public int insertSysCommision(SysCommision sysCommision) + { + sysCommision.setCreateTime(DateUtils.getNowDate()); + return sysCommisionMapper.insertSysCommision(sysCommision); + } + + /** + * 修改业务提成比例 + * + * @param sysCommision 业务提成比例 + * @return 结果 + */ + @Override + public int updateSysCommision(SysCommision sysCommision) + { + sysCommision.setUpdateTime(DateUtils.getNowDate()); + return sysCommisionMapper.updateSysCommision(sysCommision); + } + + /** + * 批量删除业务提成比例 + * + * @param ruleIds 需要删除的业务提成比例ID + * @return 结果 + */ + @Override + public int deleteSysCommisionByIds(Long[] ruleIds) + { + return sysCommisionMapper.deleteSysCommisionByIds(ruleIds); + } + + /** + * 删除业务提成比例信息 + * + * @param ruleId 业务提成比例ID + * @return 结果 + */ + @Override + public int deleteSysCommisionById(Long ruleId) + { + return sysCommisionMapper.deleteSysCommisionById(ruleId); + } +} diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml new file mode 100644 index 000000000..62fe95dbc --- /dev/null +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + select rule_id, user_id, nick_name, amount, rate, create_by, create_time, update_by, update_time, remark from sys_commision + + + + + + + + insert into sys_commision + + user_id, + nick_name, + amount, + rate, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{userId}, + #{nickName}, + #{amount}, + #{rate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sys_commision + + user_id = #{userId}, + nick_name = #{nickName}, + amount = #{amount}, + rate = #{rate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where rule_id = #{ruleId} + + + + delete from sys_commision where rule_id = #{ruleId} + + + + delete from sys_commision where rule_id in + + #{ruleId} + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/custom/commision.js b/ruoyi-ui/src/api/custom/commision.js new file mode 100644 index 000000000..f4b07f996 --- /dev/null +++ b/ruoyi-ui/src/api/custom/commision.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询业务提成比例列表 +export function listCommision(query) { + return request({ + url: '/custom/commision/list', + method: 'get', + params: query + }) +} + +// 查询业务提成比例详细 +export function getCommision(ruleId) { + return request({ + url: '/custom/commision/' + ruleId, + method: 'get' + }) +} + +// 新增业务提成比例 +export function addCommision(data) { + return request({ + url: '/custom/commision', + method: 'post', + data: data + }) +} + +// 修改业务提成比例 +export function updateCommision(data) { + return request({ + url: '/custom/commision', + method: 'put', + data: data + }) +} + +// 删除业务提成比例 +export function delCommision(ruleId) { + return request({ + url: '/custom/commision/' + ruleId, + method: 'delete' + }) +} + +// 导出业务提成比例 +export function exportCommision(query) { + return request({ + url: '/custom/commision/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/custom/commision/index.vue b/ruoyi-ui/src/views/custom/commision/index.vue new file mode 100644 index 000000000..fc75cd97a --- /dev/null +++ b/ruoyi-ui/src/views/custom/commision/index.vue @@ -0,0 +1,326 @@ + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 0035c6333..6e8ac6e22 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -34,7 +34,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.110.150:8090`, + target: `http://localhost:8091`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql index 92a5dbc93..121515d92 100644 --- a/sql/ry_20200920.sql +++ b/sql/ry_20200920.sql @@ -693,8 +693,8 @@ 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 '分成比例', + amount decimal comment '金额', + rate float comment '分成比例', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者',