From 0ed60fb059df6a4997857f06721c79727af0a915 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Sun, 11 Oct 2020 00:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=9A=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCommisionController.java | 7 +- .../custom/mapper/SysCommisionMapper.java | 4 +- .../custom/service/ISysCommisionService.java | 2 +- .../service/impl/SysCommisionServiceImpl.java | 4 +- .../mapper/custom/SysCommisionMapper.xml | 138 ++++++---- .../resources/mapper/system/SysUserMapper.xml | 75 ++++-- ruoyi-ui/src/api/custom/commision.js | 5 +- ruoyi-ui/src/api/system/user.js | 254 +++++++++--------- .../views/custom/commision/config/index.vue | 4 +- ruoyi-ui/src/views/system/user/index.vue | 38 +-- 10 files changed, 289 insertions(+), 242 deletions(-) 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 index a395dd8be..c78e13754 100644 --- 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 @@ -68,8 +68,10 @@ public class SysCommisionController extends BaseController { */ @PreAuthorize("@ss.hasPermi('commision:config:query')") @GetMapping(value = "/{ruleId}") - public AjaxResult getInfo(@PathVariable("ruleId") Long ruleId) { - return AjaxResult.success(sysCommisionService.selectSysCommisionById(ruleId)); + public AjaxResult getInfo(@PathVariable("ruleId") Long ruleId, SysCommision sysCommision) { + sysCommision.setRuleId(ruleId); + System.out.println(sysCommision); + return AjaxResult.success(sysCommisionService.selectSysCommisionById(sysCommision)); } /** @@ -119,6 +121,7 @@ public class SysCommisionController extends BaseController { detail.setRate(0F); SysCommision tmpQueryCom = new SysCommision(); tmpQueryCom.setUserId(detail.getUserId()); + tmpQueryCom.setPostId(detail.getPostId()); List tmpComList = sysCommisionService.selectSysCommisionList(tmpQueryCom); float dAmount = detail.getAmount().floatValue(); 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 index 88dd27272..38964a8b5 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysCommisionMapper.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysCommisionMapper.java @@ -14,10 +14,10 @@ public interface SysCommisionMapper /** * 查询业务提成比例 * - * @param ruleId 业务提成比例ID + * @param sysCommision 业务提成比例ID * @return 业务提成比例 */ - public SysCommision selectSysCommisionById(Long ruleId); + public SysCommision selectSysCommisionById(SysCommision sysCommision); /** * 查询业务提成比例列表 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 index b58d6d180..95bb80583 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysCommisionService.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysCommisionService.java @@ -17,7 +17,7 @@ public interface ISysCommisionService * @param ruleId 业务提成比例ID * @return 业务提成比例 */ - public SysCommision selectSysCommisionById(Long ruleId); + public SysCommision selectSysCommisionById(SysCommision sysCommision); /** * 查询业务提成比例列表 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 index 843042b7d..35696357d 100644 --- 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 @@ -27,9 +27,9 @@ public class SysCommisionServiceImpl implements ISysCommisionService * @return 业务提成比例 */ @Override - public SysCommision selectSysCommisionById(Long ruleId) + public SysCommision selectSysCommisionById(SysCommision sysCommision) { - return sysCommisionMapper.selectSysCommisionById(ruleId); + return sysCommisionMapper.selectSysCommisionById(sysCommision); } /** diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml index fa8ba65d2..979ebc568 100644 --- a/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml @@ -29,66 +29,78 @@ - SELECT ${column} AS user_id, SUM(amount) AS amount + SELECT ${column} AS user_id, ${postId} AS post_id, SUM(amount) AS amount FROM sys_order - WHERE ${column} IS NOT NULL + WHERE ${column} IS NOT NULL AND ${column} <> 0 AND review_status = 'yes' - AND date_format(order_time,'%y%m%d') >= date_format(${beginTime},'%y%m%d') - AND date_format(order_time,'%y%m%d') <= date_format(${endTime},'%y%m%d') + AND date_format(order_time,'%y%m%d') >= + date_format(${beginTime},'%y%m%d') + + AND date_format(order_time,'%y%m%d') <= + date_format(${endTime},'%y%m%d') + GROUP BY ${column} - + + + and user_id = #{userId} and post_id = #{postId} - + + + where rule_id = #{ruleId} @@ -122,6 +139,7 @@ insert into sys_commision user_id, + post_id, amount, rate, create_by, @@ -132,6 +150,7 @@ #{userId}, + #{postId}, #{amount}, #{rate}, #{createBy}, @@ -146,6 +165,7 @@ update sys_commision user_id = #{userId}, + post_id = #{postId}, amount = #{amount}, rate = #{rate}, create_by = #{createBy}, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index bfa35dafb..32462d0a0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -53,9 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, p.post_id, p.post_name - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id - left join sys_user_post up on up.user_id = u.user_id - left join sys_post p on p.post_id = up.post_id +-- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, +-- d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, +-- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, p.post_id, p.post_name +-- from sys_user u +-- left join sys_dept d on u.dept_id = d.dept_id +-- left join sys_user_role ur on u.user_id = ur.user_id +-- left join sys_role r on r.role_id = ur.role_id +-- left join sys_user_post up on up.user_id = u.user_id +-- left join sys_post p on p.post_id = up.post_id + SELECT * FROM sys_user + JOIN (SELECT dept_id, dept_name, parent_id, order_num, leader, status as dept_status FROM sys_dept) AS d USING(dept_id) + JOIN (SELECT * FROM sys_user_role) AS ur USING(user_id) + JOIN (SELECT role_id, role_name, role_key, role_sort, data_scope, status AS role_status FROM sys_role) AS r USING(role_id) + JOIN ( + SELECT user_id, GROUP_CONCAT(post_name SEPARATOR ',') AS post_name, GROUP_CONCAT(post_id SEPARATOR ',') AS post_id + FROM ( + SELECT * FROM sys_user_post + JOIN (SELECT post_id, post_name FROM sys_post) AS p USING(post_id) + ) AS up GROUP BY user_id + ) AS ups USING(user_id) - where u.user_name = #{userName} + where user_name = #{userName}