From 5522e23de2908ed2c209d3b44c7ca87d5cc7dc68 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 8 Oct 2020 21:02:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=90=A5=E5=8A=A9?= =?UTF-8?q?=E7=90=86=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCommisionController.java | 24 +- .../controller/custom/SysOrderController.java | 4 + .../com/ruoyi/custom/domain/SysOrder.java | 299 ++++++++++-------- .../mapper/custom/SysOrderMapper.xml | 7 +- ruoyi-ui/src/views/custom/order/index.vue | 44 ++- ruoyi-ui/src/views/system/user/index.vue | 64 ++-- 6 files changed, 266 insertions(+), 176 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 722c35fea..9046ca157 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 @@ -116,35 +116,31 @@ public class SysCommisionController extends BaseController { startPage(); List list = sysCommisionService.selectSysCommisionDetail(sysCommision); for (SysCommision detail : list) { + detail.setRate(0F); SysCommision tmpQueryCom = new SysCommision(); tmpQueryCom.setUserId(detail.getUserId()); List tmpComList = sysCommisionService.selectSysCommisionList(tmpQueryCom); - boolean comHit = false; for (int i = 0; i < tmpComList.size(); i++) { SysCommision com = tmpComList.get(i); float dAmount = detail.getAmount().floatValue(); float cAmount = com.getAmount().floatValue(); + detail.setRate(com.getRate()); if (dAmount < cAmount && i == 0) { - comHit = false; + // 第一条规则 break; } else if (i == tmpComList.size() - 1 && dAmount > cAmount) { - comHit = true; - detail.setRate(com.getRate()); + // 最后一条规则 break; } else if (dAmount >= cAmount && dAmount < tmpComList.get(i + 1).getAmount().floatValue()) { - comHit = true; - detail.setRate(com.getRate()); + // 中间规则 + break; } } - if (!comHit) { - detail.setRate(0F); - detail.setCommision(BigDecimal.ZERO); - } else { - float amount = detail.getAmount().floatValue(); - amount = amount * detail.getRate() / 100F; - detail.setCommision(new BigDecimal(amount)); - } + + float amount = detail.getAmount().floatValue(); + amount = amount * detail.getRate() / 100F; + detail.setCommision(new BigDecimal(amount)); } return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java index 279a10fa1..9540b89f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java @@ -69,6 +69,8 @@ public class SysOrderController extends BaseController { order.setPlanner(user.getNickName()); } else if (user.getUserId().equals(order.getPlannerAssisId())) { order.setPlannerAssis(user.getNickName()); + } else if (user.getUserId().equals(order.getOperatorAssisId())) { + order.setOperatorAssis(user.getNickName()); } } } @@ -102,6 +104,8 @@ public class SysOrderController extends BaseController { order.setPlanner(user.getNickName()); } else if (user.getUserId().equals(order.getPlannerAssisId())) { order.setPlannerAssis(user.getNickName()); + } else if (user.getUserId().equals(order.getOperatorAssisId())) { + order.setOperatorAssis(user.getNickName()); } } } diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java index ba8f0b93a..1cd76494c 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java @@ -2,6 +2,7 @@ package com.ruoyi.custom.domain; import java.math.BigDecimal; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,105 +15,178 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author wonder * @date 2020-09-24 */ -public class SysOrder extends BaseEntity -{ +public class SysOrder extends BaseEntity { private static final long serialVersionUID = 1L; - /** 编号 */ + /** + * 编号 + */ @Excel(name = "编号") private Long orderId; - /** 客户姓名 */ + /** + * 客户姓名 + */ @Excel(name = "客户姓名") private String customer; - /** 电话 */ + /** + * 电话 + */ @Excel(name = "电话") private String phone; - /** 金额 */ + /** + * 金额 + */ @Excel(name = "金额") private BigDecimal amount; - /** 收款方式 */ + /** + * 收款方式 + */ private Long payTypeId; - /** 收款方式 */ + /** + * 收款方式 + */ @Excel(name = "收款方式") private String payType; - /** 售前 */ + /** + * 售前 + */ private Long preSaleId; - /** 售前 */ + /** + * 售前 + */ @Excel(name = "售前") private String preSale; - /** 售后 */ + /** + * 售后 + */ private Long afterSaleId; - /** 售后 */ + /** + * 售后 + */ @Excel(name = "售后") private String afterSale; - /** 营养师 */ + /** + * 营养师 + */ private Long nutritionistId; - /** 营养师 */ + /** + * 营养师 + */ @Excel(name = "营养师") private String nutritionist; - /** 助理营养师 */ + /** + * 助理营养师 + */ private Long nutriAssisId; - /** 助理营养师 */ + /** + * 助理营养师 + */ @Excel(name = "助理营养师") private String nutriAssis; - /** 账号 */ + /** + * 账号 + */ private Long accountId; - /** 账号 */ + /** + * 账号 + */ @Excel(name = "账号") private String account; - /** 策划 */ + /** + * 策划 + */ private Long plannerId; - /** 策划 */ + /** + * 策划 + */ @Excel(name = "策划") private String planner; - /** 策划助理 */ + /** + * 策划助理 + */ private Long plannerAssisId; - /** 策划助理 */ + /** + * 策划助理 + */ @Excel(name = "策划助理") private String plannerAssis; - /** 运营 */ + /** + * 运营 + */ private Long operatorId; - /** 运营 */ + /** + * 运营 + */ @Excel(name = "运营") private String operator; - /** 推荐人 */ + /** + * 运营助理 + */ + private Long operatorAssisId; + + @Excel(name = "运营助理") + private String operatorAssis; + + /** + * 推荐人 + */ @Excel(name = "推荐人") private String recommender; - /** 服务月数 */ + /** + * 服务月数 + */ @Excel(name = "服务月数") private String serveMonth; @Excel(name = "审核状态", dictType = "cus_review_status") private String reviewStatus; - /** 成交日期 */ + /** + * 成交日期 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; + public void setOperatorAssis(String operatorAssis) { + this.operatorAssis = operatorAssis; + } + + public void setOperatorAssisId(Long operatorAssisId) { + this.operatorAssisId = operatorAssisId; + } + + public Long getOperatorAssisId() { + return operatorAssisId; + } + + public String getOperatorAssis() { + return operatorAssis; + } + public String getReviewStatus() { return reviewStatus; } @@ -129,226 +203,201 @@ public class SysOrder extends BaseEntity return serveMonth; } - public void setOrderId(Long orderId) - { + public void setOrderId(Long orderId) { this.orderId = orderId; } - public Long getOrderId() - { + public Long getOrderId() { return orderId; } - public void setCustomer(String customer) - { + + public void setCustomer(String customer) { this.customer = customer; } - public String getCustomer() - { + public String getCustomer() { return customer; } - public void setPhone(String phone) - { + + public void setPhone(String phone) { this.phone = phone; } - public String getPhone() - { + public String getPhone() { return phone; } - public void setAmount(BigDecimal amount) - { + + public void setAmount(BigDecimal amount) { this.amount = amount; } - public BigDecimal getAmount() - { + public BigDecimal getAmount() { return amount; } - public void setPayTypeId(Long payTypeId) - { + + public void setPayTypeId(Long payTypeId) { this.payTypeId = payTypeId; } - public Long getPayTypeId() - { + public Long getPayTypeId() { return payTypeId; } - public void setPayType(String payType) - { + + public void setPayType(String payType) { this.payType = payType; } - public String getPayType() - { + public String getPayType() { return payType; } - public void setPreSaleId(Long preSaleId) - { + + public void setPreSaleId(Long preSaleId) { this.preSaleId = preSaleId; } - public Long getPreSaleId() - { + public Long getPreSaleId() { return preSaleId; } - public void setPreSale(String preSale) - { + + public void setPreSale(String preSale) { this.preSale = preSale; } - public String getPreSale() - { + public String getPreSale() { return preSale; } - public void setAfterSaleId(Long afterSaleId) - { + + public void setAfterSaleId(Long afterSaleId) { this.afterSaleId = afterSaleId; } - public Long getAfterSaleId() - { + public Long getAfterSaleId() { return afterSaleId; } - public void setAfterSale(String afterSale) - { + + public void setAfterSale(String afterSale) { this.afterSale = afterSale; } - public String getAfterSale() - { + public String getAfterSale() { return afterSale; } - public void setNutritionistId(Long nutritionistId) - { + + public void setNutritionistId(Long nutritionistId) { this.nutritionistId = nutritionistId; } - public Long getNutritionistId() - { + public Long getNutritionistId() { return nutritionistId; } - public void setNutritionist(String nutritionist) - { + + public void setNutritionist(String nutritionist) { this.nutritionist = nutritionist; } - public String getNutritionist() - { + public String getNutritionist() { return nutritionist; } - public void setNutriAssisId(Long nutriAssisId) - { + + public void setNutriAssisId(Long nutriAssisId) { this.nutriAssisId = nutriAssisId; } - public Long getNutriAssisId() - { + public Long getNutriAssisId() { return nutriAssisId; } - public void setNutriAssis(String nutriAssis) - { + + public void setNutriAssis(String nutriAssis) { this.nutriAssis = nutriAssis; } - public String getNutriAssis() - { + public String getNutriAssis() { return nutriAssis; } - public void setAccountId(Long accountId) - { + + public void setAccountId(Long accountId) { this.accountId = accountId; } - public Long getAccountId() - { + public Long getAccountId() { return accountId; } - public void setAccount(String account) - { + + public void setAccount(String account) { this.account = account; } - public String getAccount() - { + public String getAccount() { return account; } - public void setPlannerId(Long plannerId) - { + + public void setPlannerId(Long plannerId) { this.plannerId = plannerId; } - public Long getPlannerId() - { + public Long getPlannerId() { return plannerId; } - public void setPlanner(String planner) - { + + public void setPlanner(String planner) { this.planner = planner; } - public String getPlanner() - { + public String getPlanner() { return planner; } - public void setPlannerAssisId(Long plannerAssisId) - { + + public void setPlannerAssisId(Long plannerAssisId) { this.plannerAssisId = plannerAssisId; } - public Long getPlannerAssisId() - { + public Long getPlannerAssisId() { return plannerAssisId; } - public void setPlannerAssis(String plannerAssis) - { + + public void setPlannerAssis(String plannerAssis) { this.plannerAssis = plannerAssis; } - public String getPlannerAssis() - { + public String getPlannerAssis() { return plannerAssis; } - public void setOperatorId(Long operatorId) - { + + public void setOperatorId(Long operatorId) { this.operatorId = operatorId; } - public Long getOperatorId() - { + public Long getOperatorId() { return operatorId; } - public void setOperator(String operator) - { + + public void setOperator(String operator) { this.operator = operator; } - public String getOperator() - { + public String getOperator() { return operator; } - public void setRecommender(String recommender) - { + + public void setRecommender(String recommender) { this.recommender = recommender; } - public String getRecommender() - { + public String getRecommender() { return recommender; } - public void setOrderTime(Date orderTime) - { + + public void setOrderTime(Date orderTime) { this.orderTime = orderTime; } - public Date getOrderTime() - { + public Date getOrderTime() { return orderTime; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("orderId", getOrderId()) .append("customer", getCustomer()) .append("phone", getPhone()) @@ -376,6 +425,8 @@ public class SysOrder extends BaseEntity .append("plannerAssis", getPlannerAssis()) .append("operatorId", getOperatorId()) .append("operator", getOperator()) + .append("operatorAssisId", getOperatorAssisId()) + .append("operatorAssis", getOperatorAssis()) .append("recommender", getRecommender()) .append("orderTime", getOrderTime()) .append("serveMonth", getServeMonth()) diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 62a50b777..33bf31e84 100644 --- a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -25,6 +25,7 @@ + @@ -32,7 +33,7 @@ - select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time, o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.recommender, o.order_time from sys_order o + select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time, o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id, o.recommender, o.order_time from sys_order o LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS acc ON acc.dict_value = o.account_id @@ -52,6 +53,7 @@ and planner_id = #{plannerId} and planner_assis_id = #{plannerAssisId} and operator_id = #{operatorId} + and operator_assis_id = #{operatorAssisId} and recommender = #{recommender} 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') @@ -87,6 +89,7 @@ planner_id, planner_assis_id, operator_id, + operator_assis_id, recommender, order_time, serve_month, @@ -111,6 +114,7 @@ #{plannerId}, #{plannerAssisId}, #{operatorId}, + #{operatorAssisId}, #{recommender}, #{orderTime}, #{serveMonth}, @@ -138,6 +142,7 @@ planner_id = #{plannerId}, planner_assis_id = #{plannerAssisId}, operator_id = #{operatorId}, + operator_assis_id = #{operatorAssisId}, recommender = #{recommender}, order_time = #{orderTime}, serve_month = #{serveMonth}, diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue index bc57bf5bf..4bd63a26a 100644 --- a/ruoyi-ui/src/views/custom/order/index.vue +++ b/ruoyi-ui/src/views/custom/order/index.vue @@ -121,6 +121,17 @@ + + + + + + + + @@ -389,6 +401,23 @@ + + + + + + + + + + + + @@ -401,11 +430,6 @@ - - - - - @@ -474,6 +498,8 @@ plannerAssisIdOptions: [], // 运营字典 operatorIdOptions: [], + // + operatorAssisIdOptions: [], // 查询参数 queryParams: { pageNum: 1, @@ -490,6 +516,7 @@ plannerId: null, plannerAssisId: null, operatorId: null, + operatorAssisId: null, recommender: null, reviewStatus: null, }, @@ -562,6 +589,7 @@ this.plannerIdOptions = options['planner'] || []; this.plannerAssisIdOptions = options['planner_assis'] || []; this.operatorIdOptions = options['operator'] || []; + this.operatorAssisIdOptions = options['operator_assis'] || []; }) this.getDicts("cus_pay_type").then(response => { this.payTypeIdOptions = response.data; @@ -621,6 +649,10 @@ operatorIdFormat(row, column) { return this.selectDictLabel(this.operatorIdOptions, row.operatorId); }, + // 运营助理字典翻译 + operatorAssisIdFormat(row, column) { + return this.selectDictLabel(this.operatorAssisIdOptions, row.operatorAssisId); + }, // 取消按钮 cancel() { this.open = false; @@ -632,6 +664,7 @@ const defaultServeMonth = this.serveMonthOption.find(opt => opt.remark === 'default'); const defaultAccount = this.accountIdOptions.find(opt => opt.remark === 'default'); const defaultOperator = this.operatorIdOptions.find(opt => opt.remark === 'default'); + const defaultOperatorAssis = this.operatorAssisIdOptions.find(opt => opt.remark === 'default'); const defaultPresale = this.preSaleIdOptions.find(opt => opt.remark === 'default'); const defaultAftersale = this.afterSaleIdOptions.find(opt => opt.remark === 'default'); const defaultNutritionist = this.nutritionistIdOptions.find(opt => opt.remark === 'default'); @@ -657,6 +690,7 @@ plannerId: defaultPlanner ? parseInt(defaultPlanner.dictValue) : null, plannerAssisId: defaultPlannerAssis ? parseInt(defaultPlannerAssis.dictValue) : null, operatorId: defaultOperator ? parseInt(defaultOperator.dictValue) : null, + operatorAssisId: defaultOperatorAssis ? parseInt(defaultOperatorAssis.dictValue) : null, recommender: null, orderTime: null, serveMonth: defaultServeMonth ? parseInt(defaultServeMonth.dictValue) : 1, diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 520b0a520..453d34abc 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -15,14 +15,14 @@ - + - - - + + + + - - + + - +