From 340399c7201f8d7ca37f5dceba044840e0328a4a Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Thu, 7 Jan 2021 19:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=B5=A0?= =?UTF-8?q?=E9=80=81=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=E6=9A=82=E5=81=9C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCustomerController.java | 3 +- .../custom/SysOrderPauseController.java | 106 +++++ .../com/stdiet/custom/domain/SysOrder.java | 14 + .../stdiet/custom/domain/SysOrderPause.java | 127 ++++++ .../dto/response/CustomerListResponse.java | 16 + .../custom/mapper/SysOrderPauseMapper.java | 61 +++ .../custom/service/ISysOrderPauseService.java | 61 +++ .../impl/SysOrderPauseServiceImpl.java | 96 +++++ .../mapper/custom/SysOrderMapper.xml | 6 +- .../mapper/custom/SysOrderPauseMapper.xml | 100 +++++ stdiet-ui/src/api/custom/orderPause.js | 53 +++ stdiet-ui/src/router/index.js | 15 +- stdiet-ui/src/utils/ruoyi.js | 3 + stdiet-ui/src/views/custom/order/index.vue | 39 +- .../src/views/custom/order/orderPause.vue | 366 ++++++++++++++++++ 15 files changed, 1061 insertions(+), 5 deletions(-) create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderPauseService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml create mode 100644 stdiet-ui/src/api/custom/orderPause.js create mode 100644 stdiet-ui/src/views/custom/order/orderPause.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java index 43a4b1b53..34780a771 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java @@ -1,11 +1,9 @@ package com.stdiet.web.controller.custom; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import com.stdiet.custom.domain.SysPhysicalSigns; -import org.apache.commons.lang.StringUtils; import com.stdiet.common.utils.bean.ObjectUtils; import com.stdiet.custom.dto.request.CustomerInvestigateRequest; @@ -67,6 +65,7 @@ public class SysCustomerController extends BaseController CustomerListResponse customerListResponse = null; for (SysCustomer customer : list) { customerListResponse = ObjectUtils.getObjectByObject(customer.getSign(), CustomerListResponse.class); + customerListResponse.setCreateTime(customer.getCreateTime()); customerListResponse.setName(customer.getName()); customerListResponse.setPhone(customer.getPhone()); StringBuilder signStr = new StringBuilder(); diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java new file mode 100644 index 000000000..fac987123 --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java @@ -0,0 +1,106 @@ +package com.stdiet.web.controller.custom; + +import java.text.SimpleDateFormat; +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.custom.domain.SysOrderPause; +import com.stdiet.custom.service.ISysOrderPauseService; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; + +/** + * 订单服务暂停Controller + * + * @author wonder + * @date 2021-01-07 + */ +@RestController +@RequestMapping("/orderPause/pause") +public class SysOrderPauseController extends BaseController +{ + @Autowired + private ISysOrderPauseService sysOrderPauseService; + + /** + * 查询订单服务暂停列表 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:query')") + @GetMapping("/list") + public TableDataInfo list(SysOrderPause sysOrderPause) + { + startPage(); + List list = sysOrderPauseService.selectSysOrderPauseList(sysOrderPause); + return getDataTable(list); + } + + /** + * 导出订单服务暂停列表 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:export')") + @Log(title = "订单服务暂停", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysOrderPause sysOrderPause) + { + List list = sysOrderPauseService.selectSysOrderPauseList(sysOrderPause); + ExcelUtil util = new ExcelUtil(SysOrderPause.class); + return util.exportExcel(list, "pause"); + } + + /** + * 获取订单服务暂停详细信息 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysOrderPauseService.selectSysOrderPauseById(id)); + } + + /** + * 新增订单服务暂停 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:add')") + @Log(title = "订单服务暂停", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysOrderPause sysOrderPause) + { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + System.out.println(simpleDateFormat.format(sysOrderPause.getPauseStartDate())); + return toAjax(sysOrderPauseService.insertSysOrderPause(sysOrderPause)); + } + + /** + * 修改订单服务暂停 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:edit')") + @Log(title = "订单服务暂停", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysOrderPause sysOrderPause) + { + return toAjax(sysOrderPauseService.updateSysOrderPause(sysOrderPause)); + } + + /** + * 删除订单服务暂停 + */ + @PreAuthorize("@ss.hasPermi('orderPause:pause:remove')") + @Log(title = "订单服务暂停", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysOrderPauseService.deleteSysOrderPauseByIds(ids)); + } +} \ No newline at end of file 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 49ff67ea7..533ed121c 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 @@ -169,6 +169,12 @@ public class SysOrder extends BaseEntity { @Excel(name = "服务时长") private String serveTime; + /** + * 赠送时长 + */ + @Excel(name = "赠送时长", width = 30, suffix = "天") + private String giveServeDay; + private Long serveTimeId; @Excel(name = "审核状态", dictType = "cus_review_status") @@ -448,6 +454,14 @@ public class SysOrder extends BaseEntity { return orderTime; } + public String getGiveServeDay() { + return giveServeDay; + } + + public void setGiveServeDay(String giveServeDay) { + this.giveServeDay = giveServeDay; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java new file mode 100644 index 000000000..18462e2ec --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java @@ -0,0 +1,127 @@ +package com.stdiet.custom.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; + +/** + * 订单服务暂停对象 sys_order_pause + * + * @author xzj + * @date 2021-01-07 + */ +public class SysOrderPause extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 订单id */ + private Long orderId; + + /** 服务暂停开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "服务暂停开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date pauseStartDate; + + /** 服务暂停结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "服务暂停结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date pauseEndDate; + + /** 服务暂停理由 */ + @Excel(name = "服务暂停理由") + private String reason; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 删除标识 0未删除 1已删除，默认0 */ + private Integer delFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOrderId(Long orderId) + { + this.orderId = orderId; + } + + public Long getOrderId() + { + return orderId; + } + public void setPauseStartDate(Date pauseStartDate) + { + this.pauseStartDate = pauseStartDate; + } + + public Date getPauseStartDate() + { + return pauseStartDate; + } + public void setPauseEndDate(Date pauseEndDate) + { + this.pauseEndDate = pauseEndDate; + } + + public Date getPauseEndDate() + { + return pauseEndDate; + } + public void setReason(String reason) + { + this.reason = reason; + } + + public String getReason() + { + return reason; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(Integer delFlag) + { + this.delFlag = delFlag; + } + + public Integer getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderId", getOrderId()) + .append("pauseStartDate", getPauseStartDate()) + .append("pauseEndDate", getPauseEndDate()) + .append("reason", getReason()) + .append("remarks", getRemarks()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("delFlag", getDelFlag()) + .toString(); + } +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CustomerListResponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CustomerListResponse.java index deecaf600..d2781a59e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CustomerListResponse.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CustomerListResponse.java @@ -3,6 +3,8 @@ package com.stdiet.custom.dto.response; import com.stdiet.common.annotation.Excel; import com.stdiet.common.core.domain.BaseEntity; +import java.util.Date; + /** * 客户体征信息响应DTO * @@ -17,6 +19,10 @@ public class CustomerListResponse extends BaseEntity /** $column.columnComment */ private Long id; + /** 创建时间 */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** 名字 */ @Excel(name = "名字") private String name; @@ -361,4 +367,14 @@ public class CustomerListResponse extends BaseEntity public void setDifficulty(String difficulty) { this.difficulty = difficulty; } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java new file mode 100644 index 000000000..ed18b78d8 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java @@ -0,0 +1,61 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysOrderPause; + +/** + * 订单服务暂停Mapper接口 + * + * @author wonder + * @date 2021-01-07 + */ +public interface SysOrderPauseMapper +{ + /** + * 查询订单服务暂停 + * + * @param id 订单服务暂停ID + * @return 订单服务暂停 + */ + public SysOrderPause selectSysOrderPauseById(Long id); + + /** + * 查询订单服务暂停列表 + * + * @param sysOrderPause 订单服务暂停 + * @return 订单服务暂停集合 + */ + public List selectSysOrderPauseList(SysOrderPause sysOrderPause); + + /** + * 新增订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + public int insertSysOrderPause(SysOrderPause sysOrderPause); + + /** + * 修改订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + public int updateSysOrderPause(SysOrderPause sysOrderPause); + + /** + * 删除订单服务暂停 + * + * @param id 订单服务暂停ID + * @return 结果 + */ + public int deleteSysOrderPauseById(Long id); + + /** + * 批量删除订单服务暂停 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysOrderPauseByIds(Long[] ids); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderPauseService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderPauseService.java new file mode 100644 index 000000000..bfcfdd83b --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderPauseService.java @@ -0,0 +1,61 @@ +package com.stdiet.custom.service; + +import java.util.List; +import com.stdiet.custom.domain.SysOrderPause; + +/** + * 订单服务暂停Service接口 + * + * @author wonder + * @date 2021-01-07 + */ +public interface ISysOrderPauseService +{ + /** + * 查询订单服务暂停 + * + * @param id 订单服务暂停ID + * @return 订单服务暂停 + */ + public SysOrderPause selectSysOrderPauseById(Long id); + + /** + * 查询订单服务暂停列表 + * + * @param sysOrderPause 订单服务暂停 + * @return 订单服务暂停集合 + */ + public List selectSysOrderPauseList(SysOrderPause sysOrderPause); + + /** + * 新增订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + public int insertSysOrderPause(SysOrderPause sysOrderPause); + + /** + * 修改订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + public int updateSysOrderPause(SysOrderPause sysOrderPause); + + /** + * 批量删除订单服务暂停 + * + * @param ids 需要删除的订单服务暂停ID + * @return 结果 + */ + public int deleteSysOrderPauseByIds(Long[] ids); + + /** + * 删除订单服务暂停信息 + * + * @param id 订单服务暂停ID + * @return 结果 + */ + public int deleteSysOrderPauseById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java new file mode 100644 index 000000000..971676220 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java @@ -0,0 +1,96 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; +import com.stdiet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysOrderPauseMapper; +import com.stdiet.custom.domain.SysOrderPause; +import com.stdiet.custom.service.ISysOrderPauseService; + +/** + * 订单服务暂停Service业务层处理 + * + * @author wonder + * @date 2021-01-07 + */ +@Service +public class SysOrderPauseServiceImpl implements ISysOrderPauseService +{ + @Autowired + private SysOrderPauseMapper sysOrderPauseMapper; + + /** + * 查询订单服务暂停 + * + * @param id 订单服务暂停ID + * @return 订单服务暂停 + */ + @Override + public SysOrderPause selectSysOrderPauseById(Long id) + { + return sysOrderPauseMapper.selectSysOrderPauseById(id); + } + + /** + * 查询订单服务暂停列表 + * + * @param sysOrderPause 订单服务暂停 + * @return 订单服务暂停 + */ + @Override + public List selectSysOrderPauseList(SysOrderPause sysOrderPause) + { + return sysOrderPauseMapper.selectSysOrderPauseList(sysOrderPause); + } + + /** + * 新增订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + @Override + public int insertSysOrderPause(SysOrderPause sysOrderPause) + { + sysOrderPause.setCreateTime(DateUtils.getNowDate()); + return sysOrderPauseMapper.insertSysOrderPause(sysOrderPause); + } + + /** + * 修改订单服务暂停 + * + * @param sysOrderPause 订单服务暂停 + * @return 结果 + */ + @Override + public int updateSysOrderPause(SysOrderPause sysOrderPause) + { + sysOrderPause.setUpdateTime(DateUtils.getNowDate()); + return sysOrderPauseMapper.updateSysOrderPause(sysOrderPause); + } + + /** + * 批量删除订单服务暂停 + * + * @param ids 需要删除的订单服务暂停ID + * @return 结果 + */ + @Override + public int deleteSysOrderPauseByIds(Long[] ids) + { + return sysOrderPauseMapper.deleteSysOrderPauseByIds(ids); + } + + /** + * 删除订单服务暂停信息 + * + * @param id 订单服务暂停ID + * @return 结果 + */ + @Override + public int deleteSysOrderPauseById(Long id) + { + return sysOrderPauseMapper.deleteSysOrderPauseById(id); + } +} \ 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 e8a3be7d8..31bc9788d 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -35,13 +35,14 @@ + select o.order_id, o.review_status, o.customer, o.phone, 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 from sys_order o + o.recommender, o.order_time,o.give_serve_day 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 LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_serve_time') AS ser ON ser.dict_value = o.serve_time_id @@ -133,6 +134,7 @@ order_time, serve_time_id, review_status, + give_serve_day, #{orderId}, @@ -162,6 +164,7 @@ #{orderTime}, #{serveTimeId}, #{reviewStatus}, + #{giveServeDay}, @@ -194,6 +197,7 @@ order_time = #{orderTime}, serve_time_id = #{serveTimeId}, review_status = #{reviewStatus}, + give_serve_day = #{giveServeDay}, where order_id = #{orderId} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml new file mode 100644 index 000000000..c0accccc4 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + select id, order_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_order_pause sop + + + + + + + + insert into sys_order_pause + + order_id, + pause_start_date, + pause_end_date, + reason, + remarks, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{orderId}, + #{pauseStartDate}, + #{pauseEndDate}, + #{reason}, + #{remarks}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update sys_order_pause + + order_id = #{orderId}, + pause_start_date = #{pauseStartDate}, + pause_end_date = #{pauseEndDate}, + reason = #{reason}, + remarks = #{remarks}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_order_pause set del_flag = 1 where id = #{id} + + + + update sys_order_pause set del_flag = 1 where id in + + #{id} + + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/orderPause.js b/stdiet-ui/src/api/custom/orderPause.js new file mode 100644 index 000000000..e968e755c --- /dev/null +++ b/stdiet-ui/src/api/custom/orderPause.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询订单服务暂停列表 +export function listPause(query) { + return request({ + url: '/orderPause/pause/list', + method: 'get', + params: query + }) +} + +// 查询订单服务暂停详细 +export function getPause(id) { + return request({ + url: '/orderPause/pause/' + id, + method: 'get' + }) +} + +// 新增订单服务暂停 +export function addPause(data) { + return request({ + url: '/orderPause/pause', + method: 'post', + data: data + }) +} + +// 修改订单服务暂停 +export function updatePause(data) { + return request({ + url: '/orderPause/pause', + method: 'put', + data: data + }) +} + +// 删除订单服务暂停 +export function delPause(id) { + return request({ + url: '/orderPause/pause/' + id, + method: 'delete' + }) +} + +// 导出订单服务暂停 +export function exportPause(query) { + return request({ + url: '/orderPause/pause/export', + method: 'get', + params: query + }) +} diff --git a/stdiet-ui/src/router/index.js b/stdiet-ui/src/router/index.js index 094d0f629..2154737b7 100644 --- a/stdiet-ui/src/router/index.js +++ b/stdiet-ui/src/router/index.js @@ -67,10 +67,23 @@ export const constantRoutes = [ path: 'index', component: (resolve) => require(['@/views/custom/order'], resolve), name: '订单', - meta: { title: '订单', icon: 'build', noCache: true, affix: true } + meta: { title: '订单管理', icon: 'build', noCache: true, affix: true } } ] }, + { + path: '/order', + component: Layout, + hidden: true, + children: [ + { + path: 'orderPause/:orderId', + component: (resolve) => require(['@/views/custom/order/orderPause'], resolve), + name: 'orderPause', + meta: { title: '订单暂停记录'} + } + ] + }, { path: '/user', component: Layout, diff --git a/stdiet-ui/src/utils/ruoyi.js b/stdiet-ui/src/utils/ruoyi.js index 3ebb37a6f..87e1f30f4 100644 --- a/stdiet-ui/src/utils/ruoyi.js +++ b/stdiet-ui/src/utils/ruoyi.js @@ -218,6 +218,9 @@ export function validatorIDCard(idcode, type) { msg: "为了避免javascript数值范围误差，idcode 必须是字符串" } } + if(idcode != null && idcode.indexOf("x") != -1){ + idcode = idcode.replace("x", "X"); + } const idcard_patter = /^[1-9][0-9]{5}([1][9][0-9]{2}|[2][0][0|1][0-9])([0][1-9]|[1][0|1|2])([0][1-9]|[1|2][0-9]|[3][0|1])[0-9]{3}([0-9]|[X])$/; // 判断格式是否正确 const format = idcard_patter.test(idcode); diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue index ad3b5dd46..e92e9ebe8 100644 --- a/stdiet-ui/src/views/custom/order/index.vue +++ b/stdiet-ui/src/views/custom/order/index.vue @@ -233,6 +233,11 @@ + + + @@ -255,6 +260,14 @@ v-hasPermi="['custom:order:edit']" >修改 + 暂停记录管理 + + + + + + + + @@ -545,6 +570,8 @@ accountIdOptions: [], // 服务时长 serveTimeIdOption: [], + // 赠送时长 + giveTimeIdOption: [], // 审核状态 reviewStatusOptions: [], // 策划助理字典 @@ -672,6 +699,9 @@ this.getDicts("cus_serve_time").then(response => { this.serveTimeIdOption = response.data; }); + this.getDicts("give_serve_daye_type").then(response => { + this.giveTimeIdOption = response.data; + }); this.getDicts("cus_review_status").then(response => { this.reviewStatusOptions = response.data; }) @@ -736,6 +766,7 @@ reset() { const defaultPayType = this.payTypeIdOptions.find(opt => opt.remark === 'default'); const defaultServeTime = this.serveTimeIdOption.find(opt => opt.remark === 'default'); + const defaultGiveServeTime = this.giveTimeIdOption.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'); @@ -771,7 +802,8 @@ recommender: null, orderTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), serveTimeId: defaultServeTime ? parseInt(defaultServeTime.dictValue) : null, - reviewStatus: this.review + reviewStatus: this.review, + giveServeDay: defaultGiveServeTime ? parseInt(defaultGiveServeTime.dictValue) : null }; this.resetForm("form"); }, @@ -804,6 +836,7 @@ const orderId = row.orderId || this.ids getOrder(orderId).then(response => { this.form = response.data; + this.form.giveServeDay = this.form.giveServeDay == 0 ? null : parseInt(this.form.giveServeDay+""); this.open = true; this.title = "修改销售订单"; }); @@ -868,6 +901,10 @@ }, handleStatusClick(data) { console.log(data); + }, + orderPauseManage(order) { + console.log(order.orderId); + this.$router.push({ name: 'orderPause', params: { 'orderId': order.orderId }}) } } }; diff --git a/stdiet-ui/src/views/custom/order/orderPause.vue b/stdiet-ui/src/views/custom/order/orderPause.vue new file mode 100644 index 000000000..12adfd663 --- /dev/null +++ b/stdiet-ui/src/views/custom/order/orderPause.vue @@ -0,0 +1,366 @@ + + +