From 64cda6be9e97862691277c6c71fec752dc272dbc Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Mon, 11 Jan 2021 21:06:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=A4=A9=E8=AE=A1=E7=AE=97=E6=8F=90?= =?UTF-8?q?=E6=88=90=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCommisionController.java | 18 + .../controller/custom/SysOrderController.java | 4 +- .../com/stdiet/common/utils/DateUtils.java | 34 ++ .../custom/domain/SysCommissionDayDetail.java | 185 +++++++ .../com/stdiet/custom/domain/SysOrder.java | 20 +- .../domain/SysOrderCommisionDayDetail.java | 152 ++++++ .../custom/mapper/SysCommisionMapper.java | 2 + .../stdiet/custom/mapper/SysOrderMapper.java | 7 + .../custom/service/ISysCommisionService.java | 4 + .../service/ISysCommissionDayService.java | 20 + .../service/impl/SysCommisionServiceImpl.java | 5 + .../impl/SysCommissionDayServiceImpl.java | 477 ++++++++++++++++++ .../mapper/custom/SysCommisionMapper.xml | 8 + .../mapper/custom/SysOrderMapper.xml | 74 +++ stdiet-ui/src/api/custom/commision.js | 9 + .../custom/commision/detail_day/index.vue | 264 ++++++++++ 16 files changed, 1278 insertions(+), 5 deletions(-) create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java create mode 100644 stdiet-ui/src/views/custom/commision/detail_day/index.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java index 11ec0ee1a..7a13103c0 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java @@ -1,8 +1,11 @@ package com.stdiet.web.controller.custom; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.List; +import com.stdiet.custom.domain.SysCommissionDayDetail; +import com.stdiet.custom.service.ISysCommissionDayService; import com.stdiet.framework.web.domain.server.Sys; import com.stdiet.system.domain.CusSalesman; import com.stdiet.system.service.ISysUserService; @@ -40,6 +43,9 @@ public class SysCommisionController extends BaseController { @Autowired private ISysUserService userService; + @Autowired + private ISysCommissionDayService sysCommissionDayService; + /** * 查询业务提成比例列表 */ @@ -181,4 +187,16 @@ public class SysCommisionController extends BaseController { } return getDataTable(list); } + + /** + * 按天计算提成详细列表 + * */ + @PreAuthorize("@ss.hasPermi('commisionDay:detail:list')") + @GetMapping("/detailDay") + public TableDataInfo getDetailDay(SysCommision sysCommision) { + startPage(); + return getDataTable(sysCommissionDayService.calculateCommissionByDay(sysCommision)); + } + + } diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java index a326d3c4b..c1c85272d 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java @@ -77,9 +77,9 @@ public class SysOrderController extends OrderBaseController { order.setOperatorAssis(user.getNickName()); } } - if (order.getPhone() != null && !order.getPhone().equals("")) { + /*if (order.getPhone() != null && !order.getPhone().equals("")) { order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); - } + }*/ } return getOrderDataTable(list, totalAmount); } diff --git a/stdiet-common/src/main/java/com/stdiet/common/utils/DateUtils.java b/stdiet-common/src/main/java/com/stdiet/common/utils/DateUtils.java index fad84fe43..b85390db6 100644 --- a/stdiet-common/src/main/java/com/stdiet/common/utils/DateUtils.java +++ b/stdiet-common/src/main/java/com/stdiet/common/utils/DateUtils.java @@ -3,6 +3,10 @@ package com.stdiet.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.Date; import org.apache.commons.lang3.time.DateFormatUtils; @@ -152,4 +156,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils // long sec = diff % nd % nh % nm / ns; return day + "天" + hour + "小时" + min + "分钟"; } + + /** + * Date对象转LocalDateTime + * */ + public static LocalDateTime dateToLocalDateTime(Date date){ + return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); + } + + /** + * LocalDateTime对象转Date + * */ + public static Date localDateTimeToDate(LocalDateTime localDateTime){ + ZonedDateTime zdt = LocalDateTime.now().atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + /** + * Date对象转LocalDate + * */ + public static LocalDate dateToLocalDate(Date date){ + return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + } + + /** + * LocalDate转Date + */ + public static Date localDateToDate(LocalDate localDate) { + ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault()); + return Date.from(zonedDateTime.toInstant()); + } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java new file mode 100644 index 000000000..20aaead1a --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommissionDayDetail.java @@ -0,0 +1,185 @@ +package com.stdiet.custom.domain; + +import com.stdiet.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +public class SysCommissionDayDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + //用户ID + private Long userId; + + //用户姓名 + private String nickName; + + //用户账户 + private String userName; + + //用户岗位ID + private Long postId; + + //岗位名称 + private String postName; + + private BigDecimal totalCommissionAmount; + + private BigDecimal totalHasSentCommissionAmount; + + private BigDecimal totalNotSentCommissionAmount; + + private List> sendDetailList; + + + //提成比例 + private Float rate; + + //订单成交总额 + private BigDecimal orderTotalAmount; + + //服务总天数 + private Integer serverTotalDay; + + //服务总额（每笔订单的服务天数 * 每天金额，相加） + private BigDecimal serverTotalAmount; + + //服务订单总数量 + private Integer serverOrderTotalCount; + + //服务暂停总天数 + private Integer serverOrderPauseTotalDay; + + //服务提成金额 + private BigDecimal commissionTotalAmount; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getPostName() { + return postName; + } + + public void setPostName(String postName) { + this.postName = postName; + } + + public Float getRate() { + return rate; + } + + public void setRate(Float rate) { + this.rate = rate; + } + + public BigDecimal getOrderTotalAmount() { + return orderTotalAmount; + } + + public void setOrderTotalAmount(BigDecimal orderTotalAmount) { + this.orderTotalAmount = orderTotalAmount; + } + + public Integer getServerTotalDay() { + return serverTotalDay; + } + + public void setServerTotalDay(Integer serverTotalDay) { + this.serverTotalDay = serverTotalDay; + } + + public BigDecimal getServerTotalAmount() { + return serverTotalAmount; + } + + public void setServerTotalAmount(BigDecimal serverTotalAmount) { + this.serverTotalAmount = serverTotalAmount; + } + + public Integer getServerOrderTotalCount() { + return serverOrderTotalCount; + } + + public void setServerOrderTotalCount(Integer serverOrderTotalCount) { + this.serverOrderTotalCount = serverOrderTotalCount; + } + + public Integer getServerOrderPauseTotalDay() { + return serverOrderPauseTotalDay; + } + + public void setServerOrderPauseTotalDay(Integer serverOrderPauseTotalDay) { + this.serverOrderPauseTotalDay = serverOrderPauseTotalDay; + } + + public BigDecimal getCommissionTotalAmount() { + return commissionTotalAmount; + } + + public void setCommissionTotalAmount(BigDecimal commissionTotalAmount) { + this.commissionTotalAmount = commissionTotalAmount; + } + + public Long getPostId() { + return postId; + } + + public void setPostId(Long postId) { + this.postId = postId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public BigDecimal getTotalCommissionAmount() { + return totalCommissionAmount; + } + + public void setTotalCommissionAmount(BigDecimal totalCommissionAmount) { + this.totalCommissionAmount = totalCommissionAmount; + } + + public BigDecimal getTotalHasSentCommissionAmount() { + return totalHasSentCommissionAmount; + } + + public void setTotalHasSentCommissionAmount(BigDecimal totalHasSentCommissionAmount) { + this.totalHasSentCommissionAmount = totalHasSentCommissionAmount; + } + + public BigDecimal getTotalNotSentCommissionAmount() { + return totalNotSentCommissionAmount; + } + + public void setTotalNotSentCommissionAmount(BigDecimal totalNotSentCommissionAmount) { + this.totalNotSentCommissionAmount = totalNotSentCommissionAmount; + } + + public List> getSendDetailList() { + return sendDetailList; + } + + public void setSendDetailList(List> sendDetailList) { + this.sendDetailList = sendDetailList; + } +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java index 533ed121c..eee9e056e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java @@ -2,6 +2,7 @@ package com.stdiet.custom.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -173,7 +174,7 @@ public class SysOrder extends BaseEntity { * 赠送时长 */ @Excel(name = "赠送时长", width = 30, suffix = "天") - private String giveServeDay; + private Integer giveServeDay; private Long serveTimeId; @@ -187,6 +188,11 @@ public class SysOrder extends BaseEntity { @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date orderTime; + /** + * 订单暂停记录 非持久化字段 + * */ + private List orderPauseList; + @JsonFormat(pattern = "yyyy-MM-dd") public Date getStartTime() { return startTime; @@ -454,14 +460,22 @@ public class SysOrder extends BaseEntity { return orderTime; } - public String getGiveServeDay() { + public Integer getGiveServeDay() { return giveServeDay; } - public void setGiveServeDay(String giveServeDay) { + public void setGiveServeDay(Integer giveServeDay) { this.giveServeDay = giveServeDay; } + public List getOrderPauseList() { + return orderPauseList; + } + + public void setOrderPauseList(List orderPauseList) { + this.orderPauseList = orderPauseList; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java new file mode 100644 index 000000000..7d9ff4f04 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java @@ -0,0 +1,152 @@ +package com.stdiet.custom.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Map; + +/** + * 每个订单的提成详情 + * */ +public class SysOrderCommisionDayDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /**订单成交时间*/ + private LocalDateTime orderTime; + + /**客户姓名*/ + private String name; + + /**服务结束时间*/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private LocalDate serverStartDate; + + /**服务结束时间*/ + private LocalDate serverEndDate; + + /**服务月数*/ + private Integer serverMonth; + + /**赠送天数*/ + private Integer giveDay; + + /**订单金额*/ + private BigDecimal orderAmount; + + /**服务天数*/ + private Integer serverDay; + + /**每天金额*/ + private BigDecimal dayMoney; + + /**每年每月暂停天数*/ + private Map everyYearMonthPauseDay; + + /**每年每月服务天数**/ + private Map everyYearMonthServerDay; + + /**每年每月对应金额*/ + private Map everyYearMonthServerMoney; + + public LocalDateTime getOrderTime() { + return orderTime; + } + + public void setOrderTime(LocalDateTime orderTime) { + this.orderTime = orderTime; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public LocalDate getServerStartDate() { + return serverStartDate; + } + + public void setServerStartDate(LocalDate serverStartDate) { + this.serverStartDate = serverStartDate; + } + + public LocalDate getServerEndDate() { + return serverEndDate; + } + + public void setServerEndDate(LocalDate serverEndDate) { + this.serverEndDate = serverEndDate; + } + + public Integer getServerMonth() { + return serverMonth; + } + + public void setServerMonth(Integer serverMonth) { + this.serverMonth = serverMonth; + } + + public Integer getGiveDay() { + return giveDay; + } + + public void setGiveDay(Integer giveDay) { + this.giveDay = giveDay; + } + + public BigDecimal getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(BigDecimal orderAmount) { + this.orderAmount = orderAmount; + } + + public Integer getServerDay() { + return serverDay; + } + + public void setServerDay(Integer serverDay) { + this.serverDay = serverDay; + } + + public BigDecimal getDayMoney() { + return dayMoney; + } + + public void setDayMoney(BigDecimal dayMoney) { + this.dayMoney = dayMoney; + } + + public Map getEveryYearMonthPauseDay() { + return everyYearMonthPauseDay; + } + + public void setEveryYearMonthPauseDay(Map everyYearMonthPauseDay) { + this.everyYearMonthPauseDay = everyYearMonthPauseDay; + } + + public Map getEveryYearMonthServerDay() { + return everyYearMonthServerDay; + } + + public void setEveryYearMonthServerDay(Map everyYearMonthServerDay) { + this.everyYearMonthServerDay = everyYearMonthServerDay; + } + + public Map getEveryYearMonthServerMoney() { + return everyYearMonthServerMoney; + } + + public void setEveryYearMonthServerMoney(Map everyYearMonthServerMoney) { + this.everyYearMonthServerMoney = everyYearMonthServerMoney; + } +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java index a89d473c9..cca1dbfc3 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java @@ -60,4 +60,6 @@ public interface SysCommisionMapper public int deleteSysCommisionByIds(Long[] ruleIds); public List selectSysCommisionDetail(SysCommision sysCommision); + + List selectSysCommisionDayDetail(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java index f1d2b98f8..1ae261f20 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java @@ -3,6 +3,7 @@ package com.stdiet.custom.mapper; import java.math.BigDecimal; import java.util.List; import com.stdiet.custom.domain.SysOrder; +import org.apache.ibatis.annotations.Param; /** * 销售订单Mapper接口 @@ -66,4 +67,10 @@ public interface SysOrderMapper * @return */ public BigDecimal selectAllOrderAmount(SysOrder sysOrder); + + /** + * 获取订单信息 + * @return + */ + List selectSimpleOrderMessage(@Param("userId") Long userId); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java index bbfa7259a..e39a7ae56 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java @@ -1,6 +1,8 @@ package com.stdiet.custom.service; import java.util.List; +import java.util.Set; + import com.stdiet.custom.domain.SysCommision; /** @@ -60,4 +62,6 @@ public interface ISysCommisionService public int deleteSysCommisionById(Long ruleId); public List selectSysCommisionDetail(SysCommision sysCommision); + + List selectSysCommisionDayDetail(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java new file mode 100644 index 000000000..c5693fea1 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java @@ -0,0 +1,20 @@ +package com.stdiet.custom.service; + +import com.stdiet.custom.domain.SysCommision; +import com.stdiet.custom.domain.SysCommissionDayDetail; +import com.stdiet.custom.domain.SysOrderCommisionDayDetail; + +import java.util.List; +import java.util.Map; + +/** + * 按天计算提成 + * + * @author wonder + * @date 2020-09-24 + */ +public interface ISysCommissionDayService { + + List calculateCommissionByDay(SysCommision sysCommision); + +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java index 8cfa7824e..b043f756e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java @@ -98,4 +98,9 @@ public class SysCommisionServiceImpl implements ISysCommisionService public List selectSysCommisionDetail(SysCommision sysCommision) { return sysCommisionMapper.selectSysCommisionDetail(sysCommision); } + + @Override + public List selectSysCommisionDayDetail(SysCommision sysCommision){ + return sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); + } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java new file mode 100644 index 000000000..452c16517 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -0,0 +1,477 @@ +package com.stdiet.custom.service.impl; + +import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.StringUtils; +import com.stdiet.custom.domain.*; +import com.stdiet.custom.mapper.SysCommisionMapper; +import com.stdiet.custom.mapper.SysOrderMapper; +import com.stdiet.custom.mapper.SysOrderPauseMapper; +import com.stdiet.custom.service.ISysCommisionService; +import com.stdiet.custom.service.ISysCommissionDayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalAdjusters; +import java.util.*; + +@Service +public class SysCommissionDayServiceImpl implements ISysCommissionDayService { + + @Autowired + private SysCommisionMapper sysCommisionMapper; + + @Autowired + private SysOrderMapper sysOrderMapper; + + @Autowired + private SysOrderPauseMapper sysOrderPauseMapper; + + @Override + public List calculateCommissionByDay(SysCommision sysCommision){ + List result = new ArrayList<>(); + //查询用户 + List list = sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); + if(list != null && list.size() > 0){ + Map> orderDetailMap = getOrderByList(null); + SysCommissionDayDetail sysCommissionDayDetail = null; + for(SysCommision commision : list){ + sysCommissionDayDetail = new SysCommissionDayDetail(); + sysCommissionDayDetail.setUserId(commision.getUserId()); + sysCommissionDayDetail.setNickName(commision.getUserName()); + sysCommissionDayDetail.setPostId(commision.getPostId()); + sysCommissionDayDetail.setPostName(commision.getPostName()); + sysCommissionDayDetail.setOrderTotalAmount(commision.getAmount()); + //获取查询时间 + LocalDate localDate = StringUtils.isEmpty(sysCommision.getBeginTime()) ? LocalDate.now() : LocalDate.parse(sysCommision.getBeginTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + //dealServerOrderCommissionDetail2(orderDetailMap.get(sysCommissionDayDetail.getUserId()), sysCommissionDayDetail, localDate.getYear()+""+localDate.getMonth().getValue()); + dealServerOrderCommissionDetail2(orderDetailMap.get(sysCommissionDayDetail.getUserId()), sysCommissionDayDetail); + result.add(sysCommissionDayDetail); + } + } + return result; + } + + + /** + * 根据用户ID统计出该用户在该月所有订单的服务数量、服务总天数、服务订单总额、暂停总天数 + * **/ + public void dealServerOrderCommissionDetail2(List orderDetailList, SysCommissionDayDetail sysCommissionDayDetail){ + //总提成 + double totalCommissionAmount = 0.0; + //已发放提成 + double totalHasSentCommissionAmount = 0.0; + //未发放提成 + double totalNotSentCommissionAmount = 0.0; + //未发放提成记录 + List> sendDetailList = new ArrayList<>(); + if(orderDetailList != null){ + //获取每个月的成交总额度 + Map orderAmount = new TreeMap<>(new MyComparator()); + Set commissionMonthSet = new TreeSet<>(new MyComparator()); + for (SysOrderCommisionDayDetail sysOrderCommisionDayDetail : orderDetailList) { + String yearMonth = sysOrderCommisionDayDetail.getOrderTime().getYear()+""+sysOrderCommisionDayDetail.getOrderTime().getMonth().getValue(); + if(orderAmount.containsKey(yearMonth)){ + orderAmount.put(yearMonth, orderAmount.get(yearMonth) + sysOrderCommisionDayDetail.getOrderAmount().doubleValue()); + }else{ + orderAmount.put(yearMonth, sysOrderCommisionDayDetail.getOrderAmount().doubleValue()); + } + commissionMonthSet.addAll(sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().keySet()); + } + //获取提成比例以及计算提成 + Map rateMap = getRateByAmount2(sysCommissionDayDetail.getUserId(), sysCommissionDayDetail.getPostId(), orderAmount); + + int i = 1; + double commissionA = 0D; + for (String ym : commissionMonthSet) { + double ym_mession = 0; + if(orderAmount.containsKey(ym)){ + totalCommissionAmount += orderAmount.get(ym) * rateMap.get(ym) / 100D; + } + for (SysOrderCommisionDayDetail sysOrderCommisionDayDetail : orderDetailList) { + Map everyYearMonthServerMoney = sysOrderCommisionDayDetail.getEveryYearMonthServerMoney(); + if(everyYearMonthServerMoney.containsKey(ym)){ + String orderYearMonth = sysOrderCommisionDayDetail.getOrderTime().getYear()+""+sysOrderCommisionDayDetail.getOrderTime().getMonth().getValue(); + double m = (everyYearMonthServerMoney.get(ym) == null) ? 0 : everyYearMonthServerMoney.get(ym).doubleValue(); + ym_mession += m * rateMap.get(orderYearMonth) / 100D; + } + } + if(isSendCommissionByYearMonth(ym)){ + totalHasSentCommissionAmount += ym_mession; + }else{ + Map map = new HashMap<>(); + map.put("yearMonth", ym); + if(i++ != commissionMonthSet.size()){ + map.put("yearMonthCommission", getMoney(ym_mession, 1)); + }else{ + System.out.println("最后："+commissionA); + map.put("yearMonthCommission", getMoney(totalCommissionAmount - commissionA, 1)); + } + sendDetailList.add(map); + } + commissionA += getMoney(ym_mession, 1).doubleValue(); + + } + } + sysCommissionDayDetail.setTotalCommissionAmount(getMoney(totalCommissionAmount,1)); + sysCommissionDayDetail.setTotalHasSentCommissionAmount(getMoney(totalHasSentCommissionAmount,1)); + sysCommissionDayDetail.setTotalNotSentCommissionAmount(getMoney(totalCommissionAmount - totalHasSentCommissionAmount,1)); + sysCommissionDayDetail.setSendDetailList(sendDetailList); + } + + public boolean isSendCommissionByYearMonth(String yearMonth){ + LocalDate localDate = LocalDate.of(Integer.parseInt(yearMonth.substring(0,4)), Integer.parseInt(yearMonth.substring(4)), 1); + LocalDate nowDate = LocalDate.now(); + if(localDate.getMonth().getValue() >= 0){ + return false; + } + return true; + } + + /** + * 根据用户成交总额获取对应比例，再计算提成 + * */ + public Map getRateByAmount2(Long userId, Long postId, Map amountMap){ + SysCommision tmpQueryCom = new SysCommision(); + tmpQueryCom.setUserId(userId); + tmpQueryCom.setPostId(postId); + List tmpComList = sysCommisionMapper.selectSysCommisionList(tmpQueryCom); + Map rateMap = new TreeMap<>(new MyComparator()); + for(String yearMonth : amountMap.keySet()){ + double orderAmount = amountMap.get(yearMonth); + rateMap.put(yearMonth, 0F); + if(tmpComList != null && tmpComList.size() > 0){ + for (int i = 0; i < tmpComList.size(); i++) { + SysCommision com = tmpComList.get(i); + double cAmount = com.getAmount().floatValue(); + if (orderAmount <= cAmount && i == 0) { + // 第一条规则 + rateMap.put(yearMonth,com.getRate()); + break; + } else if (i == tmpComList.size() - 1 && orderAmount > cAmount) { + // 最后一条规则 + rateMap.put(yearMonth,com.getRate()); + break; + } else if (cAmount < orderAmount && orderAmount <= tmpComList.get(i + 1).getAmount().floatValue()) { + // 中间规则 + rateMap.put(yearMonth,tmpComList.get(i + 1).getRate()); + break; + } + } + } + } + return rateMap; + } + + /** + * 根据用户ID统计出该用户在该月所有订单的服务数量、服务总天数、服务订单总额、暂停总天数 + * **/ + public void dealServerOrderCommissionDetail(List orderDetailList, SysCommissionDayDetail sysCommissionDayDetail, String yearMonth){ + //服务订单数量 + int serverOrderCount = 0; + //服务总天数 + int serverTotalDay = 0; + //服务订单总金额 + double serverTotalAmount = 0.0; + //暂停总天数 + int pauseTotalDay = 0; + if(orderDetailList != null){ + for (SysOrderCommisionDayDetail sysOrderCommisionDayDetail : orderDetailList) { + //Map dayMap = ((Map)orderMap.get("everyYearMonthServerDay")); + if(sysOrderCommisionDayDetail.getEveryYearMonthServerDay() != null && sysOrderCommisionDayDetail.getEveryYearMonthServerDay().containsKey(yearMonth)){ + int day = sysOrderCommisionDayDetail.getEveryYearMonthServerDay().get(yearMonth).intValue(); + serverTotalDay += day; + serverOrderCount += day > 0 ? 1 : 0; + } + if(sysOrderCommisionDayDetail.getEveryYearMonthServerMoney() != null && sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().containsKey(yearMonth)){ + serverTotalAmount += sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().get(yearMonth).doubleValue(); + } + //dayMap = ((Map)orderMap.get("everyYearMonthPauseDay")); + if(sysOrderCommisionDayDetail.getEveryYearMonthPauseDay() != null && sysOrderCommisionDayDetail.getEveryYearMonthPauseDay().containsKey(yearMonth)){ + pauseTotalDay += sysOrderCommisionDayDetail.getEveryYearMonthPauseDay().get(yearMonth).intValue(); + } + } + } + sysCommissionDayDetail.setServerOrderTotalCount(serverOrderCount); + sysCommissionDayDetail.setServerTotalDay(serverTotalDay); + sysCommissionDayDetail.setServerTotalAmount(getMoney(serverTotalAmount, 1)); + sysCommissionDayDetail.setServerOrderPauseTotalDay(pauseTotalDay); + //获取提成比例以及计算提成 + getRateByAmount(sysCommissionDayDetail); + + } + + /** + * 根据用户成交总额获取对应比例，再计算提成 + * */ + public void getRateByAmount(SysCommissionDayDetail sysCommissionDayDetail){ + SysCommision tmpQueryCom = new SysCommision(); + tmpQueryCom.setUserId(sysCommissionDayDetail.getUserId()); + tmpQueryCom.setPostId(sysCommissionDayDetail.getPostId()); + List tmpComList = sysCommisionMapper.selectSysCommisionList(tmpQueryCom); + double orderAmount = sysCommissionDayDetail.getOrderTotalAmount().doubleValue(); + sysCommissionDayDetail.setRate(0F); + sysCommissionDayDetail.setCommissionTotalAmount(getMoney(0.0D, 1)); + if(tmpComList != null && tmpComList.size() > 0){ + for (int i = 0; i < tmpComList.size(); i++) { + SysCommision com = tmpComList.get(i); + double cAmount = com.getAmount().floatValue(); + if (orderAmount <= cAmount && i == 0) { + // 第一条规则 + sysCommissionDayDetail.setRate(com.getRate()); + break; + } else if (i == tmpComList.size() - 1 && orderAmount > cAmount) { + // 最后一条规则 + sysCommissionDayDetail.setRate(com.getRate()); + break; + } else if (cAmount < orderAmount && orderAmount <= tmpComList.get(i + 1).getAmount().floatValue()) { + // 中间规则 + sysCommissionDayDetail.setRate(tmpComList.get(i + 1).getRate()); + break; + } + } + } + double serverAmount = sysCommissionDayDetail.getServerTotalAmount().doubleValue(); + serverAmount = serverAmount * sysCommissionDayDetail.getRate() / 100D; + sysCommissionDayDetail.setCommissionTotalAmount(getMoney(serverAmount, 1)); + } + + /** + * 查询2021年1月份之后所有订单，对订单进行处理，得出每笔订单的相关信息 + * */ + public Map> getOrderByList(Long userId){ + //查询2021年1月份之后所有订单 + List orderList = sysOrderMapper.selectSimpleOrderMessage(userId); + //整理出每个用户对应的订单List + Map> userOrderResultMap = new HashMap<>(); + for (SysOrder sysOrder : orderList) { + //建档时间为空、售后人员ID为空、营养师ID为空、订单金额为空或小于0，都视为异常订单 + if(sysOrder.getStartTime() == null || sysOrder.getAfterSaleId() == null || sysOrder.getNutritionistId() == null + || sysOrder.getAmount() == null || sysOrder.getAmount().doubleValue() < 0){ + System.out.println("客户："+ sysOrder.getCustomer() +",营养师："+sysOrder.getNutritionist() + ",售后" + sysOrder.getAfterSale()); + continue; + } + //对每笔订单进行处理，统计出该比订单在每年每月对应的服务天数、金额、暂停天数等 + SysOrderCommisionDayDetail sysOrderCommisionDayDetail = statisticsOrderMessage(sysOrder); + addUserOrderResultMap(sysOrder.getAfterSaleId(), sysOrderCommisionDayDetail, userOrderResultMap); + addUserOrderResultMap(sysOrder.getNutritionistId(), sysOrderCommisionDayDetail, userOrderResultMap); + } + return userOrderResultMap; + } + + /** + * 根据用户ID将订单添加到对应用户的订单List + * */ + public void addUserOrderResultMap(Long id, SysOrderCommisionDayDetail sysOrderCommisionDayDetail, Map> map){ + if(map.containsKey(id)){ + map.get(id).add(sysOrderCommisionDayDetail); + }else{ + List orderMessageMapList = new ArrayList<>(); + orderMessageMapList.add(sysOrderCommisionDayDetail); + map.put(id, orderMessageMapList); + } + } + + /** + * 统计每笔订单的服务开始时间、结束时间、每年每月服务天数、服务金额、服务暂停天数等信息 + * */ + public SysOrderCommisionDayDetail statisticsOrderMessage(SysOrder sysOrder){ + //服务开始时间(客户建档时间) + LocalDate serverStartDate = DateUtils.dateToLocalDate(sysOrder.getStartTime()); + //订单总服务月数 + int serverMonth = sysOrder.getServeTimeId().intValue()/30; + //赠送时长 + int giveDay = sysOrder.getGiveServeDay().intValue(); + //订单金额 + BigDecimal orderAmount = sysOrder.getAmount(); + //每年每月暂停天数，key为年份加月份，如:2021年1月=20211 + Map everyYearMonthPauseDay = getEveryYearMonthPauseDay(sysOrder.getOrderPauseList()); + //该笔订单暂停总天数 + int pauseTotalDay = getTotalByMap(everyYearMonthPauseDay); + //根据开始时间、服务月数、赠送天数、暂停天数算出该笔订单服务到期时间 + LocalDate serverEndDate = getServerEndDate(serverStartDate, serverMonth, giveDay, pauseTotalDay); + //计算每年每月服务天数 + Map everyYearMonthServerDay = getEveryYearMonthDayCount(serverStartDate, serverEndDate, everyYearMonthPauseDay); + //服务总天数 + int serverDay = getTotalByMap(everyYearMonthServerDay); + //每天对应金额 + BigDecimal dayMoney = getMoney(orderAmount.doubleValue()/serverDay, 1); + //每年每月对于金额 + Map everyYearMonthServerMoney = getEveryMonthServerMoney(everyYearMonthServerDay, orderAmount, dayMoney); + + SysOrderCommisionDayDetail sysOrderCommisionDayDetail = new SysOrderCommisionDayDetail(); + sysOrderCommisionDayDetail.setOrderTime(DateUtils.dateToLocalDateTime(sysOrder.getOrderTime())); + sysOrderCommisionDayDetail.setName(sysOrder.getCustomer()); + sysOrderCommisionDayDetail.setServerStartDate(serverStartDate); + sysOrderCommisionDayDetail.setServerEndDate(serverEndDate); + sysOrderCommisionDayDetail.setServerMonth(serverMonth); + sysOrderCommisionDayDetail.setGiveDay(giveDay); + sysOrderCommisionDayDetail.setOrderAmount(orderAmount); + sysOrderCommisionDayDetail.setServerDay(serverDay); + sysOrderCommisionDayDetail.setDayMoney(dayMoney); + sysOrderCommisionDayDetail.setEveryYearMonthPauseDay(everyYearMonthPauseDay); + sysOrderCommisionDayDetail.setEveryYearMonthServerDay(everyYearMonthServerDay); + sysOrderCommisionDayDetail.setEveryYearMonthServerMoney(everyYearMonthServerMoney); + return sysOrderCommisionDayDetail; + } + + /** + * 获取每年每月暂停天数 + * @Param list 暂停记录集合 + * */ + public Map getEveryYearMonthPauseDay(List list){ + Map pauseMap = new TreeMap<>(new MyComparator()); + for (SysOrderPause sysOrderPause : list) { + if(sysOrderPause.getPauseStartDate() == null || sysOrderPause.getPauseEndDate() == null){ + continue; + } + LocalDate pauseStartDate = DateUtils.dateToLocalDate(sysOrderPause.getPauseStartDate()); + LocalDate pauseEndDate = DateUtils.dateToLocalDate(sysOrderPause.getPauseEndDate()); + //根据暂停记录获取该条记录在每年每月的暂停天数 + Map orderYearMonthPauseDay = getEveryYearMonthDayCount(pauseStartDate, pauseEndDate, null); + //每条暂停记录的暂停天数进行汇总 + for (String key : orderYearMonthPauseDay.keySet()) { + if(pauseMap.containsKey(key)){ + pauseMap.put(key, pauseMap.get(key) + orderYearMonthPauseDay.get(key)); + }else{ + pauseMap.put(key, orderYearMonthPauseDay.get(key)); + } + } + } + return pauseMap; + } + + /** + * 获取Map集合中Value的总和 + * */ + public int getTotalByMap(Map map){ + int total = 0; + for(String key : map.keySet()){ + total += map.get(key).intValue(); + } + return total; + } + + /** + * 获取订单服务时间范围中每年每月服务天数，减去当月暂停天数 + * @Param server_start_date 服务开始时间 + * @Param server_end_date 服务到期时间 + * @Param pauseDayMap 每年每月暂停天数Map + * */ + public Map getEveryMonthServerDay(LocalDate server_start_date, LocalDate server_end_date, Map pauseDayMap){ + return getEveryYearMonthDayCount(server_start_date, server_end_date, pauseDayMap); + } + + /** + * 获取订单服务时间范围中每年每月服务金额 + * @Param everyMonthServerDay 每年每月服务天数 + * @Param orderMoney 订单总额 + * @Param dayMoney 每天对于金额 + * */ + public Map getEveryMonthServerMoney(Map everyMonthServerDay, BigDecimal orderMoney, BigDecimal dayMoney){ + Map everyMonthServerMoney = new TreeMap<>(new MyComparator()); + Set keySet = everyMonthServerDay.keySet(); + int i = 1; + double totalMoney = 0.0; + for(String key : keySet){ + if(i++ != keySet.size()){ + everyMonthServerMoney.put(key, getMoney(everyMonthServerDay.get(key) * dayMoney.doubleValue(), 1)); + totalMoney += everyMonthServerMoney.get(key).doubleValue(); + }else{ + //由于小数点只保留一位，最后一个月的金额等于总额减去前几个月金额，避免总数不一致 + everyMonthServerMoney.put(key, getMoney(orderMoney.doubleValue() - totalMoney, 1)); + } + } + return everyMonthServerMoney; + } + + + /** + * 根据开始日期、结束日期统计出时间范围内每年每月对应的天数 + * */ + public Map getEveryYearMonthDayCount(LocalDate startDate, LocalDate endDate, Map lessDayMap){ + Map everyYearMonthServerDay = new TreeMap<>(new MyComparator()); + //每月开始第一天 + LocalDate everyMonthFirstDate = startDate; + //每月最后一天 + LocalDate everyMonthLastDate = everyMonthFirstDate.with(TemporalAdjusters.lastDayOfMonth()); + int day = 0; + boolean breakFlag = false; + //写100防止死循环 + for(int i = 0; i < 100; i++){ + if(ChronoUnit.DAYS.between(everyMonthLastDate, endDate) >= 0){ + day = Period.between(everyMonthFirstDate, everyMonthLastDate).getDays() + 1; + }else{ + day = Period.between(everyMonthFirstDate, endDate).getDays() + 1; + breakFlag = true; + } + String key = everyMonthFirstDate.getYear()+""+everyMonthFirstDate.getMonth().getValue(); + day -= (lessDayMap == null || lessDayMap.get(key) == null) ? 0 : lessDayMap.get(key); + everyYearMonthServerDay.put(key, day >= 0 ? day : 0); + everyMonthFirstDate = (everyMonthFirstDate.plusMonths(1)); + everyMonthFirstDate = everyMonthFirstDate.of(everyMonthFirstDate.getYear(), everyMonthFirstDate.getMonthValue(), 1); + everyMonthLastDate = everyMonthFirstDate.with(TemporalAdjusters.lastDayOfMonth()); + if(breakFlag){ + break; + } + } + return everyYearMonthServerDay; + } + + /** + * 根据服务月数、赠送时长、暂停天数计算出服务截止日期 + * **/ + public LocalDate getServerEndDate(LocalDate server_start_date, int server_month, int give_daye, int pauseDayCount){ + return server_start_date.plusMonths(server_month).plusDays(give_daye + pauseDayCount); + } + + /** + * double转为BigDecimal，保留一位小数，向下舍去 + * */ + public BigDecimal getMoney(double money, int n){ + return new BigDecimal(money).setScale(n, RoundingMode.DOWN); + } + + /** + * 集合排序key值比较器 + * */ + class MyComparator implements Comparator{ + + @Override + public int compare(String o1, String o2) { + return Integer.parseInt(o1) - Integer.parseInt(o2); + } + } + + public static void main(String[] args){ + DecimalFormat df = new DecimalFormat("#.#"); + BigDecimal money = new BigDecimal(3300.00/91); + System.out.println(Period.between(LocalDate.of(2020,2, 28), LocalDate.of(2020,1, 27)).getDays()); + System.out.println(ChronoUnit.DAYS.between(LocalDate.of(2021,2, 28), LocalDate.of(2021,3, 1))); + System.out.println(LocalDate.of(2020,1, 20).getYear()); + System.out.println(LocalDate.of(2021,1, 30).plusMonths(1)); + + System.out.println("s" + LocalDate.of(2021,1, 30).getMonth().getValue()); + + System.out.println("----------------------------"); + LocalDate server_end_date = LocalDate.now().plusMonths(3); + server_end_date = server_end_date.plusDays(7); + server_end_date = server_end_date.minusDays(7); + System.out.println(server_end_date); + + System.out.println(LocalDate.now().getMonth().getValue()); + + Float f = 520.4F; + System.out.println(f * 1 / 100F); + + System.out.println(new BigDecimal(f * 1 / 100F).setScale(1, RoundingMode.DOWN)); + } + + + +} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml index 6757fd593..7be516ec3 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml @@ -188,4 +188,12 @@ + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 31bc9788d..9a18ec711 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -36,6 +36,9 @@ + + + @@ -213,4 +216,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/commision.js b/stdiet-ui/src/api/custom/commision.js index 1cbb5c79c..cdf65ecf5 100644 --- a/stdiet-ui/src/api/custom/commision.js +++ b/stdiet-ui/src/api/custom/commision.js @@ -68,3 +68,12 @@ export function getSalesman() { method: 'get', }) } + +// 查询按天计算提成明细（营养师、售后） +export function detailDayCommision(query) { + return request({ + url: '/custom/commision/detailDay', + method: 'get', + params: query + }) +} diff --git a/stdiet-ui/src/views/custom/commision/detail_day/index.vue b/stdiet-ui/src/views/custom/commision/detail_day/index.vue new file mode 100644 index 000000000..1ce53c99a --- /dev/null +++ b/stdiet-ui/src/views/custom/commision/detail_day/index.vue @@ -0,0 +1,264 @@ + + +