From 8b07969264dd22aca8aae7ea714a682fea27d658 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Tue, 30 Mar 2021 15:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BF=9B=E7=B2=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/custom/SysOrderController.java | 7 +++++-- .../com/stdiet/custom/domain/SysOrder.java | 20 +++++++++---------- .../mapper/custom/SysOrderMapper.xml | 4 ++-- 3 files changed, 17 insertions(+), 14 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 8bf63065d..b37066e62 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 @@ -61,12 +61,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); } @@ -97,6 +97,9 @@ public class SysOrderController extends OrderBaseController { List userList = userService.selectAllUser(); for (SysOrder order : list) { initUserNickNameAndOrderType(userList,order); + 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-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java index 40f178e46..917ffe125 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 @@ -23,9 +23,16 @@ public class SysOrder extends BaseEntity { /** * 编号 */ - @Excel(name = "编号") + //@Excel(name = "编号") private Long orderId; + /** + * 成交日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date orderTime; + private Long cusId; /** @@ -171,7 +178,7 @@ public class SysOrder extends BaseEntity { /** * 推荐人 */ - @Excel(name = "推荐人") + //@Excel(name = "推荐人") private String recommender; /** @@ -191,13 +198,6 @@ public class SysOrder extends BaseEntity { @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 HH:mm:ss") - private Date orderTime; - /** * 调理项目id */ @@ -226,7 +226,7 @@ public class SysOrder extends BaseEntity { /** * 服务天数 */ - @Excel(name = "服务天数", width = 30) + //@Excel(name = "服务天数", width = 30) private Integer serverDay; /** diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 84c9e65dd..0fa214d70 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -57,10 +57,10 @@ - select o.order_id, o.review_status, o.cus_id, sc.name as customer, sc.phone, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time, + select o.order_id, o.review_status, o.cus_id, sc.name as customer, sc.phone, sc.fans_time as become_fan_time, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time, o.serve_time_id, 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,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,o.become_fan_time, + o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time, o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order from sys_order o LEFT JOIN sys_customer sc ON sc.id = o.cus_id