From 34a0790af2c1b133ccfe08c4368cc701d28951e0 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Thu, 21 Jan 2021 20:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=88=90=E6=94=B9=E4=B8=BA=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E4=B8=89=E4=BD=8D=E5=B0=8F=E6=95=B0=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5=EF=BC=8C=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/custom/SysOrderController.java | 11 ++++ .../custom/SysWxUserInfoController.java | 7 ++- .../com/stdiet/custom/domain/SysOrder.java | 14 +++++ .../impl/SysCommissionDayServiceImpl.java | 15 ++++-- .../mapper/custom/SysOrderMapper.xml | 1 + .../views/custom/commision/detail/index.vue | 2 +- .../custom/commision/detail_day/index.vue | 14 +++-- stdiet-ui/src/views/custom/order/index.vue | 52 ++++++++++++++++++- .../src/views/custom/signContract/index.vue | 7 ++- 9 files changed, 107 insertions(+), 16 deletions(-) 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 bdc6f8902..03df73d03 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 @@ -4,6 +4,7 @@ import com.stdiet.common.annotation.Log; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.domain.entity.SysUser; import com.stdiet.common.enums.BusinessType; +import com.stdiet.common.utils.DateUtils; import com.stdiet.common.utils.StringUtils; import com.stdiet.common.utils.poi.ExcelUtil; import com.stdiet.custom.controller.OrderBaseController; @@ -17,6 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.temporal.ChronoUnit; import java.util.List; /** @@ -81,6 +83,12 @@ public class SysOrderController extends OrderBaseController { if (StringUtils.isNotEmpty(order.getPhone())) { order.setPhone(StringUtils.hiddenPhoneNumber(order.getPhone())); } + //根据服务时长、赠送天数计算服务天数 + int month = order.getServeTimeId() != null ? order.getServeTimeId().intValue()/30 : 0; + if(order.getStartTime() != null && order.getServerEndTime() != null && order.getServeTimeId() != null && month > 0){ + long serverDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(order.getStartTime()), DateUtils.dateToLocalDate(order.getStartTime()).plusMonths(month).plusDays(order.getGiveServeDay() == null ? 0 : order.getGiveServeDay())) + 1; + order.setServerDay(Integer.parseInt(serverDay + "")); + } } return getOrderDataTable(list, totalAmount); } @@ -123,6 +131,9 @@ public class SysOrderController extends OrderBaseController { order.setOperatorAssis(user.getNickName()); } } + if (StringUtils.isNotEmpty(order.getPhone())) { + order.setPhone(StringUtils.hiddenPhoneNumber(order.getPhone())); + } } ExcelUtil util = new ExcelUtil(SysOrder.class); return util.exportExcel(list, "order"); diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java index 95098aa51..1728ff7bc 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java @@ -46,7 +46,7 @@ public class SysWxUserInfoController extends BaseController { for (SysWxUserInfo userInfo : list) { if (StringUtils.isNotEmpty(userInfo.getPhone())) { - userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); + userInfo.setPhone(StringUtils.hiddenPhoneNumber(userInfo.getPhone())); } } @@ -61,6 +61,11 @@ public class SysWxUserInfoController extends BaseController { @GetMapping("/export") public AjaxResult export(SysWxUserInfo sysWxUserInfo) { List list = sysWxUserInfoService.selectSysWxUserInfoList(sysWxUserInfo); + for (SysWxUserInfo userInfo : list) { + if (StringUtils.isNotEmpty(userInfo.getPhone())) { + userInfo.setPhone(StringUtils.hiddenPhoneNumber(userInfo.getPhone())); + } + } ExcelUtil util = new ExcelUtil(SysWxUserInfo.class); return util.exportExcel(list, "wxUserInfo"); } 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 e1b488561..b8305ad9d 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 @@ -213,6 +213,12 @@ public class SysOrder extends BaseEntity { @Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd") private Date becomeFanTime; + /** + * 服务天数 + */ + @Excel(name = "服务结束时间", width = 30) + private Integer serverDay; + /** * 订单暂停记录 非持久化字段 * */ @@ -525,6 +531,14 @@ public class SysOrder extends BaseEntity { this.becomeFanTime = becomeFanTime; } + public Integer getServerDay() { + return serverDay; + } + + public void setServerDay(Integer serverDay) { + this.serverDay = serverDay; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) 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 index 09bb09a8b..a939ac244 100644 --- 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 @@ -1,5 +1,6 @@ package com.stdiet.custom.service.impl; +import com.alibaba.fastjson.JSONArray; import com.stdiet.common.utils.DateUtils; import com.stdiet.custom.domain.*; import com.stdiet.custom.mapper.SysCommisionMapper; @@ -106,6 +107,14 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { * 根据用户ID统计出该用户在该月所有订单的服务数量、服务总天数、服务订单总额、暂停总天数 * **/ public void dealServerOrderCommissionDetail(List orderDetailList, SysCommissionDayDetail sysCommissionDayDetail){ + /*System.out.println("------------------开始--------------"); + if(orderDetailList != null){ + for(SysOrderCommisionDayDetail sysOrderCommisionDayDetail : orderDetailList){ + System.out.println("姓名："+sysOrderCommisionDayDetail.getName() + " 总天数："+sysOrderCommisionDayDetail.getServerDay() + +" 每天金额："+sysOrderCommisionDayDetail.getDayMoney() + " 一月服务天数："+sysOrderCommisionDayDetail.getEveryYearMonthServerDay().get("20211") + +" 一月对应金额："+ sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().get("20211")); + } + }*/ //总提成 BigDecimal totalCommissionAmount = new BigDecimal(0); //已发放提成 @@ -440,7 +449,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { * double转为BigDecimal，保留一位小数，向下舍去 * */ public BigDecimal getMoney(Double money, int n){ - return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN); + return new BigDecimal(money.toString()).setScale(3, BigDecimal.ROUND_HALF_UP); } /** @@ -475,10 +484,6 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { /*System.out.println(ts(109792.8 * 6 / 100D, 1)); System.out.println(ts(6587.8,2).doubleValue());*/ - System.out.println(ts(1.919,1).doubleValue()); - } - public static BigDecimal ts(Double money, int n){ - return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN); } } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 44854bfc9..2e91119e7 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -78,6 +78,7 @@ and date_format(order_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') and serve_time_id = #{serveTimeId} and review_status = #{reviewStatus} + and serve_time_id = #{serveTimeId} diff --git a/stdiet-ui/src/views/custom/commision/detail/index.vue b/stdiet-ui/src/views/custom/commision/detail/index.vue index 8eadd8e44..80dfad23e 100644 --- a/stdiet-ui/src/views/custom/commision/detail/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail/index.vue @@ -65,7 +65,7 @@ diff --git a/stdiet-ui/src/views/custom/commision/detail_day/index.vue b/stdiet-ui/src/views/custom/commision/detail_day/index.vue index 0052ab58e..09c3c6266 100644 --- a/stdiet-ui/src/views/custom/commision/detail_day/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail_day/index.vue @@ -65,23 +65,23 @@ @@ -112,7 +112,11 @@ {{scope.row.yearMonth.substring(0, 4)}}年{{scope.row.yearMonth.substring(4)}}月 - + + + diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue index 51c0650e9..76074813a 100644 --- a/stdiet-ui/src/views/custom/order/index.vue +++ b/stdiet-ui/src/views/custom/order/index.vue @@ -143,6 +143,18 @@ + + + + + + + + {{ parseTime(scope.row.serverEndTime, '{y}-{m}-{d}') }} + + +