Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

营养师、售后更换的提成转移，食谱计划生成优化等

Browse Source
This commit is contained in:
xiezhijun 2021-04-03 18:38:20 +08:00
parent 8345aa2991
commit d0b2cf7d3d
14 changed files with 1116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderNutritionistReplaceRecordController.java Normal file
View File

@ -0,0 +1,137 @@
package com.stdiet.custom.controller;
import java.time.temporal.ChronoUnit;
import java.util.List;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.custom.domain.SysCommision;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.service.ISysOrderService;
import org.aspectj.weaver.loadtime.Aj;
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.SysOrderNutritionistReplaceRecord;
import com.stdiet.custom.service.ISysOrderNutritionistReplaceRecordService;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.common.core.page.TableDataInfo;
/**
* 订单营养师、售后更换记录Controller
*
* @author xzj
* @date 2021-04-02
*/
@RestController
@RequestMapping("/custom/orderNutritionistReplaceRecord")
public class SysOrderNutritionistReplaceRecordController extends BaseController
{
@Autowired
private ISysOrderNutritionistReplaceRecordService sysOrderNutritionistReplaceRecordService;
@Autowired
private ISysOrderService sysOrderService;
/**
* 查询订单营养师、售后更换记录列表
*/
@PreAuthorize("@ss.hasPermi('custom:orderNutritionistReplaceRecord:list')")
@GetMapping("/list")
public TableDataInfo list(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
startPage();
List<SysOrderNutritionistReplaceRecord> list = sysOrderNutritionistReplaceRecordService.selectSysOrderNutritionistReplaceRecordList(sysOrderNutritionistReplaceRecord);
return getDataTable(list);
}
/**
* 导出订单营养师、售后更换记录列表
*/
@PreAuthorize("@ss.hasPermi('custom:orderNutritionistReplaceRecord:export')")
@Log(title = "订单营养师、售后更换记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
List<SysOrderNutritionistReplaceRecord> list = sysOrderNutritionistReplaceRecordService.selectSysOrderNutritionistReplaceRecordList(sysOrderNutritionistReplaceRecord);
ExcelUtil<SysOrderNutritionistReplaceRecord> util = new ExcelUtil<SysOrderNutritionistReplaceRecord>(SysOrderNutritionistReplaceRecord.class);
return util.exportExcel(list, "orderNutritionistReplaceRecord");
}
/**
* 获取订单营养师、售后更换记录详细信息
*/
@PreAuthorize("@ss.hasPermi('custom:orderNutritionistReplaceRecord:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysOrderNutritionistReplaceRecordService.selectSysOrderNutritionistReplaceRecordById(id));
}
/**
* 新增订单营养师、售后更换记录
*/
@PreAuthorize("@ss.hasPermi('custom:orderNutritionistReplaceRecord:add')")
@Log(title = "订单营养师、售后更换记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
if(sysOrderNutritionistReplaceRecord.getOrderId() == null || sysOrderNutritionistReplaceRecord.getOrderId().longValue() <= 0){
return AjaxResult.error("订单ID不存在");
}
if(sysOrderNutritionistReplaceRecord.getAfterSaleId() == null || sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue() <= 0){
sysOrderNutritionistReplaceRecord.setAfterSaleId(null);
}
if(sysOrderNutritionistReplaceRecord.getNutritionistId() == null || sysOrderNutritionistReplaceRecord.getNutritionistId().longValue() <= 0){
sysOrderNutritionistReplaceRecord.setNutritionistId(null);
}
if((sysOrderNutritionistReplaceRecord.getAfterSaleId() == null || sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue() <= 0)
&& (sysOrderNutritionistReplaceRecord.getNutritionistId() == null || sysOrderNutritionistReplaceRecord.getNutritionistId().longValue() <= 0)){
return AjaxResult.error("营养师、售后不能都为空");
}
SysOrder sysOrder = sysOrderService.selectSysOrderById(sysOrderNutritionistReplaceRecord.getOrderId());
if(sysOrder == null){
return AjaxResult.error("订单不存在");
}
if(sysOrderNutritionistReplaceRecord.getStartTime() == null){
return AjaxResult.error("开始时间不能为空");
}
//更换的开始时间不能小于订单开始时间
if(ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(sysOrderNutritionistReplaceRecord.getStartTime()),DateUtils.dateToLocalDate(sysOrder.getCommissStartTime())) > 0){
return AjaxResult.error("开始时间不能小于"+ DateUtils.dateTime(sysOrder.getCommissStartTime()));
}
//更换的售后或营养师不能与原订单一致
if(sysOrderNutritionistReplaceRecord.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() == sysOrderNutritionistReplaceRecord.getNutritionistId().longValue()){
return AjaxResult.error("更换的营养师与原订单营养师不能相同");
}
if(sysOrderNutritionistReplaceRecord.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() == sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue()){
return AjaxResult.error("更换的售后与原订单售后不能相同");
}
//体验单、二开售后提成单都不支持更换营养师和售后
if(sysOrder.getAfterSaleCommissOrder().intValue() == 1 || "2".equals(sysOrder.getOrderType())){
return AjaxResult.error("二开提成单、体验单不支持更换营养师、售后");
}
return toAjax(sysOrderNutritionistReplaceRecordService.insertSysOrderNutritionistReplaceRecord(sysOrderNutritionistReplaceRecord));
}
/**
* 删除订单营养师、售后更换记录
*/
@PreAuthorize("@ss.hasPermi('custom:orderNutritionistReplaceRecord:remove')")
@Log(title = "订单营养师、售后更换记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysOrderNutritionistReplaceRecordService.deleteSysOrderNutritionistReplaceRecordByIds(ids));
}
}

6
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderCommisionDayDetail.java
View File

@ -83,4 +83,10 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
//该笔订单对应提成比例
private Float commissionRate;
//售后
private Long afterSaleId;
//营养师
private Long nutritionistId;
}

48
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java Normal file
View File

@ -0,0 +1,48 @@
package com.stdiet.custom.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 订单营养师、售后更换记录对象 sys_order_nutritionist_replace_record
*
* @author xzj
* @date 2021-04-02
*/
@Data
public class SysOrderNutritionistReplaceRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 订单ID */
@Excel(name = "订单ID")
private Long orderId;
/** 更换的营养师ID */
@Excel(name = "更换的营养师ID")
private Long nutritionistId;
/** 更换的售后ID */
@Excel(name = "更换的售后ID")
private Long afterSaleId;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 删除标识，0未删除1已删除 */
private Integer delFlag;
// 售后
private String afterSale;
//营养师
private String nutritionist;
}

69
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderNutritionistReplaceRecordMapper.java Normal file
View File

@ -0,0 +1,69 @@
package com.stdiet.custom.mapper;
import java.util.List;
import com.stdiet.custom.domain.SysOrderNutritionistReplaceRecord;
import org.apache.ibatis.annotations.Param;
/**
* 订单营养师、售后更换记录Mapper接口
*
* @author xzj
* @date 2021-04-02
*/
public interface SysOrderNutritionistReplaceRecordMapper
{
/**
* 查询订单营养师、售后更换记录
*
* @param id 订单营养师、售后更换记录ID
* @return 订单营养师、售后更换记录
*/
public SysOrderNutritionistReplaceRecord selectSysOrderNutritionistReplaceRecordById(Long id);
/**
* 查询订单营养师、售后更换记录列表
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 订单营养师、售后更换记录集合
*/
public List<SysOrderNutritionistReplaceRecord> selectSysOrderNutritionistReplaceRecordList(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 新增订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
public int insertSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 修改订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
public int updateSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 删除订单营养师、售后更换记录
*
* @param id 订单营养师、售后更换记录ID
* @return 结果
*/
public int deleteSysOrderNutritionistReplaceRecordById(Long id);
/**
* 批量删除订单营养师、售后更换记录
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteSysOrderNutritionistReplaceRecordByIds(Long[] ids);
/**
* 根据订单ID查询对应营养师、售后更换记录
* @param orderId
* @return
*/
List<SysOrderNutritionistReplaceRecord> getSysOrderReplaceRecordByOrderId(@Param("orderId")Long orderId);
}

68
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderNutritionistReplaceRecordService.java Normal file
View File

@ -0,0 +1,68 @@
package com.stdiet.custom.service;
import java.util.List;
import com.stdiet.custom.domain.SysOrderNutritionistReplaceRecord;
/**
* 订单营养师、售后更换记录Service接口
*
* @author xzj
* @date 2021-04-02
*/
public interface ISysOrderNutritionistReplaceRecordService
{
/**
* 查询订单营养师、售后更换记录
*
* @param id 订单营养师、售后更换记录ID
* @return 订单营养师、售后更换记录
*/
public SysOrderNutritionistReplaceRecord selectSysOrderNutritionistReplaceRecordById(Long id);
/**
* 查询订单营养师、售后更换记录列表
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 订单营养师、售后更换记录集合
*/
public List<SysOrderNutritionistReplaceRecord> selectSysOrderNutritionistReplaceRecordList(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 新增订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
public int insertSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 修改订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
public int updateSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord);
/**
* 批量删除订单营养师、售后更换记录
*
* @param ids 需要删除的订单营养师、售后更换记录ID
* @return 结果
*/
public int deleteSysOrderNutritionistReplaceRecordByIds(Long[] ids);
/**
* 删除订单营养师、售后更换记录信息
*
* @param id 订单营养师、售后更换记录ID
* @return 结果
*/
public int deleteSysOrderNutritionistReplaceRecordById(Long id);
/**
* 根据订单ID查询订单对于营养师、售后更换记录
* @param orderId
* @return
*/
List<SysOrderNutritionistReplaceRecord> getSysOrderReplaceRecordByOrderId(Long orderId);
}

197
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
View File

@ -11,7 +11,9 @@ import com.stdiet.custom.mapper.SysCommisionMapper;
import com.stdiet.custom.mapper.SysOrderMapper;
import com.stdiet.custom.mapper.SysOrderPauseMapper;
import com.stdiet.custom.service.ISysCommissionDayService;
import com.stdiet.custom.service.ISysOrderNutritionistReplaceRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.core.Local;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@ -32,6 +34,9 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
@Autowired
private SysOrderPauseMapper sysOrderPauseMapper;
@Autowired
private ISysOrderNutritionistReplaceRecordService sysOrderNutritionistReplaceRecordService;
@Override
public List<SysCommissionDayDetail> calculateCommissionByDay(SysCommision sysCommision){
List<SysCommissionDayDetail> result = new ArrayList<>();
@ -44,7 +49,8 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
total.setTotalNotSentCommissionAmount(new BigDecimal(0));
total.setNextMonthCommission(new BigDecimal(0));
if(list != null && list.size() > 0){
Map<Long, List<SysOrderCommisionDayDetail>> orderDetailMap = getOrderByList(sysCommision);
sysCommision.setUserId(null); //由于存在售后、营养师更换问题，不能根据营养师或售后查询订单
Map<Long, List<SysOrderCommisionDayDetail>> orderDetailMap = getOrderByList(sysCommision, true);
SysCommissionDayDetail sysCommissionDayDetail = null;
for(SysCommision commision : list){
sysCommissionDayDetail = new SysCommissionDayDetail();
@ -52,7 +58,9 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
sysCommissionDayDetail.setNickName(commision.getUserName());
sysCommissionDayDetail.setPostId(commision.getPostId());
sysCommissionDayDetail.setPostName(commision.getPostName());
if(orderDetailMap.get(sysCommissionDayDetail.getUserId()) != null && orderDetailMap.get(sysCommissionDayDetail.getUserId()).size() > 0){
System.out.println(sysCommissionDayDetail.getUserId());
}
dealServerOrderCommissionDetail(sysCommision, orderDetailMap.get(sysCommissionDayDetail.getUserId()), sysCommissionDayDetail);
result.add(sysCommissionDayDetail);
//统计所以用户总提成、已发放提成、未发放提成
@ -69,7 +77,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
}
/**
* 根据订单计算该笔订单的服务到期时间
* 根据订单计算该笔订单的服务到期时间(开始时间按照食谱开始时间，不能按照提成计算开始时间)
* @param sysOrder 订单对象
* @return
*/
@ -77,7 +85,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
public LocalDate getServerEndDate(SysOrder sysOrder){
LocalDate serverEndDate = null;
if(sysOrder != null && sysOrder.getStartTime() != null){
//服务开始时间(客户建档时间)
//服务开始时间，食谱开始时间
LocalDate serverStartDate = DateUtils.dateToLocalDate(sysOrder.getStartTime());
//订单总服务月数
int serverMonth = sysOrder.getServeTimeId() != null ? sysOrder.getServeTimeId().intValue()/30 : 0;
@ -115,7 +123,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
return result;
}
//分页查询2021年1月份之后所有订单
Map<Long, List<SysOrderCommisionDayDetail>> orderUserMap = getOrderByList(sysCommision);
Map<Long, List<SysOrderCommisionDayDetail>> orderUserMap = getOrderByList(sysCommision, false);
if(orderUserMap == null || !orderUserMap.containsKey(sysCommision.getUserId())){
return result;
}
@ -350,10 +358,18 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
/**
* 查询2021年1月份之后所有订单，对订单进行处理，得出每笔订单的相关信息
* */
public Map<Long, List<SysOrderCommisionDayDetail>> getOrderByList(SysCommision sysCommision){
* @param sysCommision 是否
* @param cutOrderFlag 是否根据售后、营养师更换记录进行订单切割计算提成
* @return
*/
public Map<Long, List<SysOrderCommisionDayDetail>> getOrderByList(SysCommision sysCommision, boolean cutOrderFlag){
//查询2021年1月份之后所有订单
List<SysOrder> orderList = sysOrderMapper.selectSimpleOrderMessage(sysCommision);
Map<Long, List<SysOrderNutritionistReplaceRecord>> replaceRecordMap = null;
if(cutOrderFlag){
//查询所有订单营养师、售后转移记录
replaceRecordMap = dealNutritionistReplaceRecord(sysOrderNutritionistReplaceRecordService.getSysOrderReplaceRecordByOrderId(null));
}
//整理出每个用户对应的订单List
Map<Long, List<SysOrderCommisionDayDetail>> userOrderResultMap = new HashMap<>();
for (SysOrder sysOrder : orderList) {
@ -364,18 +380,169 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
//System.out.println("客户："+ sysOrder.getCustomer() +",营养师："+sysOrder.getNutritionist() + ",售后" + sysOrder.getAfterSale());
continue;
}
//对每笔订单进行处理，统计出该比订单在每年每月对应的服务天数、金额、暂停天数等
List<SysOrderCommisionDayDetail> orderCommisionDayDetailList = null;
//将服务结束时间设置为空，因为提成的结束时间需要重新计算
sysOrder.setServerEndTime(null);
//判断是否存在营养师、售后更换记录
if(cutOrderFlag && replaceRecordMap.containsKey(sysOrder.getOrderId()) && replaceRecordMap.get(sysOrder.getOrderId()).size() > 0){
//将订单根据更换记录切割成多个订单
SysOrderCommisionDayDetail sysOrderCommisionDayDetail = statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime());
if(sysOrder.getAfterSaleId() != null && sysOrder.getAfterSaleId() > 0L){
addUserOrderResultMap(sysOrder.getAfterSaleId(), sysOrderCommisionDayDetail, userOrderResultMap);
orderCommisionDayDetailList = cutOrderByReplaceRecord(sysOrder, sysCommision, sysOrderCommisionDayDetail, replaceRecordMap.get(sysOrder.getOrderId()));
}else{
SysOrderCommisionDayDetail commisionDetail = statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime());
orderCommisionDayDetailList = new ArrayList<>();
orderCommisionDayDetailList.add(commisionDetail);
}
if(orderCommisionDayDetailList != null){
for (SysOrderCommisionDayDetail detail : orderCommisionDayDetailList) {
if(detail.getAfterSaleId() != null && detail.getAfterSaleId() > 0L){
addUserOrderResultMap(detail.getAfterSaleId(), detail, userOrderResultMap);
}
if(detail.getNutritionistId() != null && detail.getNutritionistId() > 0L){
addUserOrderResultMap(detail.getNutritionistId(), detail, userOrderResultMap);
}
}
if(sysOrder.getNutritionistId() != null && sysOrder.getNutritionistId() > 0L){
addUserOrderResultMap(sysOrder.getNutritionistId(), sysOrderCommisionDayDetail, userOrderResultMap);
}
}
return userOrderResultMap;
}
/**
* 对于存在售后、营养师更换的订单进行订单切割
* @param sysOrder
* @param sysCommision
* @param sysOrderCommisionDayDetail
* @param replaceRecordList
* @return
*/
public List<SysOrderCommisionDayDetail> cutOrderByReplaceRecord(SysOrder sysOrder, SysCommision sysCommision, SysOrderCommisionDayDetail sysOrderCommisionDayDetail, List<SysOrderNutritionistReplaceRecord> replaceRecordList){
List<SysOrderCommisionDayDetail> sysOrderCommisionDayDetailList = new ArrayList<>();
List<SysOrderNutritionistReplaceRecord> nutritionistRecord = new ArrayList<>();
List<SysOrderNutritionistReplaceRecord> afterSaleRecord = new ArrayList<>();
//售后和营养师分类
for (SysOrderNutritionistReplaceRecord sysOrderRecord : replaceRecordList) {
if (sysOrderRecord.getNutritionistId() != null && sysOrderRecord.getNutritionistId().longValue() > 0) {
nutritionistRecord.add(sysOrderRecord);
}
if (sysOrderRecord.getAfterSaleId() != null && sysOrderRecord.getAfterSaleId().longValue() > 0) {
afterSaleRecord.add(sysOrderRecord);
}
}
//原始订单数据
Long orderNutritionistId = sysOrder.getNutritionistId();
Long orderAfterSaleId = sysOrder.getAfterSaleId();
LocalDate serverStartDate = sysOrderCommisionDayDetail.getServerStartDate();
LocalDate serverEndDate = sysOrderCommisionDayDetail.getServerEndDate();
//营养师、售后记录不能都为0
if(nutritionistRecord.size() == 0){
sysOrder.setCommissStartTime(DateUtils.localDateToDate(serverStartDate));
sysOrder.setServerEndTime(DateUtils.localDateToDate(serverEndDate));
sysOrder.setAfterSaleId(null);
sysOrderCommisionDayDetailList.add(statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime()));
}
if(afterSaleRecord.size() == 0){
sysOrder.setCommissStartTime(DateUtils.localDateToDate(serverStartDate));
sysOrder.setServerEndTime(DateUtils.localDateToDate(serverEndDate));
sysOrder.setNutritionistId(null);
sysOrderCommisionDayDetailList.add(statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime()));
}
Map<String, SysOrderCommisionDayDetail> existMap = new HashMap<>();
for(int i = 0; i < 2; i++){
List<SysOrderNutritionistReplaceRecord> nutritAfterSaleRecord = i == 0 ? nutritionistRecord : afterSaleRecord;
if(nutritAfterSaleRecord.size() > 0){
//第一天更换记录的开始时间
LocalDate firstRecordStartTime = DateUtils.dateToLocalDate(nutritAfterSaleRecord.get(0).getStartTime());
if(ChronoUnit.DAYS.between(firstRecordStartTime, serverEndDate) < 0){
firstRecordStartTime = serverEndDate;
}
//更换的开始时间大于实际订单开始时间，则需要截断时间生成一个新订单
if(ChronoUnit.DAYS.between(serverStartDate, firstRecordStartTime) > 0){
sysOrder.setCommissStartTime(DateUtils.localDateToDate(serverStartDate));
sysOrder.setServerEndTime(DateUtils.localDateToDate(firstRecordStartTime.minusDays(1)));
sysOrder.setNutritionistId(i == 0 ? orderNutritionistId : null);
sysOrder.setAfterSaleId(i == 1 ? orderAfterSaleId : null);
//需要设置金额、服务时长、赠送时长
sysOrder.setServeTimeId(ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(sysOrder.getCommissStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()))+1);
sysOrder.setAmount(getMoney(sysOrderCommisionDayDetail.getDayMoney().doubleValue() * sysOrder.getServeTimeId()));
sysOrder.setGiveServeDay(0);
sysOrderCommisionDayDetailList.add(statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime()));
}
int index = 0;
for (SysOrderNutritionistReplaceRecord record : nutritAfterSaleRecord) {
index++;
LocalDate recordStartTime = DateUtils.dateToLocalDate(record.getStartTime());
if(ChronoUnit.DAYS.between(recordStartTime, serverStartDate) > 0){
recordStartTime = serverStartDate;
}
if((i == 0 && record.getNutritionistId() == null) || (i == 1 && record.getAfterSaleId() == null)
|| ChronoUnit.DAYS.between(recordStartTime, serverEndDate) < 0){
continue;
}
//获取下一个记录的开始时间，如果不存在则直接取服务结束时间
LocalDate nextRecordStartTime = replaceRecordList.size() > index ? DateUtils.dateToLocalDate(replaceRecordList.get(index).getStartTime()) : null;
if(nextRecordStartTime == null || ChronoUnit.DAYS.between(recordStartTime, serverEndDate) < 0){
nextRecordStartTime = serverEndDate;
}
if(ChronoUnit.DAYS.between(recordStartTime, nextRecordStartTime) <= 0){
continue;
}
sysOrder.setCommissStartTime(DateUtils.localDateToDate(recordStartTime));
sysOrder.setServerEndTime(DateUtils.localDateToDate(nextRecordStartTime.minusDays(1)));
sysOrder.setNutritionistId(i == 0 ? record.getNutritionistId() : null);
sysOrder.setAfterSaleId(i == 1 ? record.getAfterSaleId() : null);
//需要设置金额、服务时长、赠送时长
sysOrder.setServeTimeId(ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(sysOrder.getCommissStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()))+1);
sysOrder.setAmount(getMoney(sysOrderCommisionDayDetail.getDayMoney().doubleValue() * sysOrder.getServeTimeId()));
sysOrder.setGiveServeDay(0);
//判断是否已存在相同时间范围的记录
String key = DateUtils.dateTime(sysOrder.getCommissStartTime()) + DateUtils.dateTime(sysOrder.getServerEndTime());
if(existMap.containsKey(key)){
sysOrderCommisionDayDetailList.add(existMap.get(key));
}else{
existMap.put(key, statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime()));
sysOrderCommisionDayDetailList.add(existMap.get(key));
}
}
}
}
for (SysOrderCommisionDayDetail c : sysOrderCommisionDayDetailList) {
System.out.println(c.getOrderId() + "-" + c.getNutritionistId() + "-" + c.getAfterSaleId() + "-"+
DateUtils.localDateToString(c.getServerStartDate(),"yyyy-MM-dd") + "-" +
DateUtils.localDateToString(c.getServerEndDate(),"yyyy-MM-dd") +
"-" + c.getDayMoney().doubleValue() + "-" + c.getOrderAmount().doubleValue());
}
return sysOrderCommisionDayDetailList;
}
/**
* 处理订单的营养师、售后更换记录，以订单ID为单位整理
* @param list
* @return
*/
public Map<Long, List<SysOrderNutritionistReplaceRecord>> dealNutritionistReplaceRecord(List<SysOrderNutritionistReplaceRecord> list){
Map<Long, List<SysOrderNutritionistReplaceRecord>> orderReplaceRecordMap = new HashMap<>();
if(list != null && list.size() > 0){
for (SysOrderNutritionistReplaceRecord record : list) {
if(orderReplaceRecordMap.containsKey(record.getOrderId())){
orderReplaceRecordMap.get(record.getOrderId()).add(record);
}else{
List<SysOrderNutritionistReplaceRecord> recordList = new ArrayList<>();
recordList.add(record);
orderReplaceRecordMap.put(record.getOrderId(), recordList);
}
}
}
return orderReplaceRecordMap;
}
/**
* 根据用户ID将订单添加到对应用户的订单List
* */
@ -402,7 +569,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
//赠送时长
int giveDay = sysOrder.getGiveServeDay().intValue();
//服务到期时间（加赠送时间，不加暂停时间）
LocalDate serverEndDate = serverStartDate.plusMonths(serverMonth).plusDays(giveDay+serverSmallDay);
LocalDate serverEndDate = sysOrder.getServerEndTime() == null ? serverStartDate.plusMonths(serverMonth).plusDays(giveDay+serverSmallDay) : DateUtils.dateToLocalDate(sysOrder.getServerEndTime());
//订单金额
BigDecimal orderAmount = sysOrder.getAmount();
//查询暂停列表
@ -415,7 +582,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
//该笔订单暂停总天数
int pauseTotalDay = getTotalByMap(everyYearMonthPauseDay);
//服务到期时间加上暂停时间
serverEndDate = serverEndDate.plusDays(pauseTotalDay);
serverEndDate = sysOrder.getServerEndTime() == null ? serverEndDate.plusDays(pauseTotalDay) : serverEndDate;
//计算每年每月服务天数
Map<String, Integer> everyYearMonthServerDay = getEveryYearMonthDayCount(serverStartDate, serverEndDate, everyYearMonthPauseDay);
//服务总天数
@ -440,6 +607,8 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
sysOrderCommisionDayDetail.setEveryYearMonthPauseDay(everyYearMonthPauseDay);
sysOrderCommisionDayDetail.setEveryYearMonthServerDay(everyYearMonthServerDay);
sysOrderCommisionDayDetail.setEveryYearMonthServerMoney(everyYearMonthServerMoney);
sysOrderCommisionDayDetail.setAfterSaleId(sysOrder.getAfterSaleId());
sysOrderCommisionDayDetail.setNutritionistId(sysOrder.getNutritionistId());
if(StringUtils.isNotEmpty(serverScopeStartTime) && StringUtils.isNotEmpty(serverScopeEndTime)){
LocalDate realStartTime = DateUtils.stringToLocalDate(serverScopeStartTime, "yyyy-MM-dd");

105
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderNutritionistReplaceRecordServiceImpl.java Normal file
View File

@ -0,0 +1,105 @@
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.SysOrderNutritionistReplaceRecordMapper;
import com.stdiet.custom.domain.SysOrderNutritionistReplaceRecord;
import com.stdiet.custom.service.ISysOrderNutritionistReplaceRecordService;
/**
* 订单营养师、售后更换记录Service业务层处理
*
* @author xzj
* @date 2021-04-02
*/
@Service
public class SysOrderNutritionistReplaceRecordServiceImpl implements ISysOrderNutritionistReplaceRecordService
{
@Autowired
private SysOrderNutritionistReplaceRecordMapper sysOrderNutritionistReplaceRecordMapper;
/**
* 查询订单营养师、售后更换记录
*
* @param id 订单营养师、售后更换记录ID
* @return 订单营养师、售后更换记录
*/
@Override
public SysOrderNutritionistReplaceRecord selectSysOrderNutritionistReplaceRecordById(Long id)
{
return sysOrderNutritionistReplaceRecordMapper.selectSysOrderNutritionistReplaceRecordById(id);
}
/**
* 查询订单营养师、售后更换记录列表
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 订单营养师、售后更换记录
*/
@Override
public List<SysOrderNutritionistReplaceRecord> selectSysOrderNutritionistReplaceRecordList(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
return sysOrderNutritionistReplaceRecordMapper.selectSysOrderNutritionistReplaceRecordList(sysOrderNutritionistReplaceRecord);
}
/**
* 新增订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
@Override
public int insertSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
sysOrderNutritionistReplaceRecord.setCreateTime(DateUtils.getNowDate());
return sysOrderNutritionistReplaceRecordMapper.insertSysOrderNutritionistReplaceRecord(sysOrderNutritionistReplaceRecord);
}
/**
* 修改订单营养师、售后更换记录
*
* @param sysOrderNutritionistReplaceRecord 订单营养师、售后更换记录
* @return 结果
*/
@Override
public int updateSysOrderNutritionistReplaceRecord(SysOrderNutritionistReplaceRecord sysOrderNutritionistReplaceRecord)
{
sysOrderNutritionistReplaceRecord.setUpdateTime(DateUtils.getNowDate());
return sysOrderNutritionistReplaceRecordMapper.updateSysOrderNutritionistReplaceRecord(sysOrderNutritionistReplaceRecord);
}
/**
* 批量删除订单营养师、售后更换记录
*
* @param ids 需要删除的订单营养师、售后更换记录ID
* @return 结果
*/
@Override
public int deleteSysOrderNutritionistReplaceRecordByIds(Long[] ids)
{
return sysOrderNutritionistReplaceRecordMapper.deleteSysOrderNutritionistReplaceRecordByIds(ids);
}
/**
* 删除订单营养师、售后更换记录信息
*
* @param id 订单营养师、售后更换记录ID
* @return 结果
*/
@Override
public int deleteSysOrderNutritionistReplaceRecordById(Long id)
{
return sysOrderNutritionistReplaceRecordMapper.deleteSysOrderNutritionistReplaceRecordById(id);
}
/**
* 根据订单ID查询订单对于营养师、售后更换记录
* @param orderId
* @return
*/
public List<SysOrderNutritionistReplaceRecord> getSysOrderReplaceRecordByOrderId(Long orderId){
return sysOrderNutritionistReplaceRecordMapper.getSysOrderReplaceRecordByOrderId(orderId);
}
}

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -305,7 +305,7 @@ public class SysOrderServiceImpl implements ISysOrderService {
continue;
}
//判断前一个订单的结束时间是否大于第二个订单的
if(lastServerEndTime != null && ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(sysOrder.getStartTime()), lastServerEndTime) >= 0){
if(lastServerEndTime != null && ChronoUnit.DAYS.between(lastServerEndTime, DateUtils.dateToLocalDate(sysOrder.getStartTime())) != 1){
newStartTime = lastServerEndTime.plusDays(1);
//本月第一天
LocalDate monthStart = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -137,13 +137,13 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
for(SysOrder sysOrder : customerOrderList){
//订单为空、金额小于0、订单未审核不进行食谱生成、更新，只对2021年开始的订单进行食谱计划生成，判断订单金额、开始时间、结束时间，为空则直接返回，不重新生成食谱计划
if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") || sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null) {
return;
continue;
}
//判断是否提成单，拆分单中的副单，体验单,定金单
if(sysOrder.getAfterSaleCommissOrder().intValue() == 1 || ("1".equals(sysOrder.getOrderType()) && sysOrder.getMainOrderId().intValue() != 0) ||
"2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType())){
System.out.println("---------------------"+sysOrder.getOrderId()+"不生成食谱------------------------");
return;
continue;
}
//判断是否已存在食谱计划
SysRecipesPlan queryParam = new SysRecipesPlan();

2
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -61,7 +61,7 @@
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.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order
o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order,o.commiss_start_time
from sys_order o
LEFT JOIN sys_customer sc ON sc.id = o.cus_id
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

107
stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml Normal file
View File

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stdiet.custom.mapper.SysOrderNutritionistReplaceRecordMapper">
<resultMap type="SysOrderNutritionistReplaceRecord" id="SysOrderNutritionistReplaceRecordResult">
<result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="nutritionistId" column="nutritionist_id" />
<result property="afterSaleId" column="after_sale_id" />
<result property="startTime" column="start_time" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="delFlag" column="del_flag" />
<!-- 非持久化字段 -->
<result property="afterSale" column="after_sale" />
<result property="nutritionist" column="nutritionist" />
</resultMap>
<sql id="selectSysOrderNutritionistReplaceRecordVo">
select o.id, o.order_id, o.nutritionist_id, o.after_sale_id, o.start_time, o.create_time, o.create_by,
su_sale.nick_name as after_sale, su_nutritionist.nick_name as nutritionist
from sys_order_nutritionist_replace_record o
left join sys_user su_sale on su_sale.user_id = o.after_sale_id and su_sale.del_flag = 0
left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id and su_nutritionist.del_flag = 0
</sql>
<select id="selectSysOrderNutritionistReplaceRecordList" parameterType="SysOrderNutritionistReplaceRecord" resultMap="SysOrderNutritionistReplaceRecordResult">
<include refid="selectSysOrderNutritionistReplaceRecordVo"/>
where o.del_flag = 0 and o.order_id = #{orderId}
</select>
<select id="selectSysOrderNutritionistReplaceRecordById" parameterType="Long" resultMap="SysOrderNutritionistReplaceRecordResult">
<include refid="selectSysOrderNutritionistReplaceRecordVo"/>
where o.id = #{id} and o.del_flag = 0
</select>
<insert id="insertSysOrderNutritionistReplaceRecord" parameterType="SysOrderNutritionistReplaceRecord">
insert into sys_order_nutritionist_replace_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="orderId != null">order_id,</if>
<if test="nutritionistId != null">nutritionist_id,</if>
<if test="afterSaleId != null">after_sale_id,</if>
<if test="startTime != null">start_time,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="orderId != null">#{orderId},</if>
<if test="nutritionistId != null">#{nutritionistId},</if>
<if test="afterSaleId != null">#{afterSaleId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateSysOrderNutritionistReplaceRecord" parameterType="SysOrderNutritionistReplaceRecord">
update sys_order_nutritionist_replace_record
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="nutritionistId != null">nutritionist_id = #{nutritionistId},</if>
<if test="afterSaleId != null">after_sale_id = #{afterSaleId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
</update>
<update id="deleteSysOrderNutritionistReplaceRecordById" parameterType="Long">
update sys_order_nutritionist_replace_record set del_flag = 1 where id = #{id}
</update>
<update id="deleteSysOrderNutritionistReplaceRecordByIds" parameterType="String">
update sys_order_nutritionist_replace_record set del_flag = 1 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="getSysOrderReplaceRecordByOrderId" parameterType="Long" resultMap="SysOrderNutritionistReplaceRecordResult">
select id, order_id, nutritionist_id, after_sale_id, start_time, create_time, create_by from sys_order_nutritionist_replace_record
where del_flag = 0
<if test="orderId != null">
and order_id = #{orderId}
</if>
order by id asc
</select>
</mapper>

53
stdiet-ui/src/api/custom/OrderNutritionistReplaceRecord.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询订单营养师、售后更换记录列表
export function listOrderNutritionistReplaceRecord(query) {
return request({
url: '/custom/orderNutritionistReplaceRecord/list',
method: 'get',
params: query
})
}
// 查询订单营养师、售后更换记录详细
export function getOrderNutritionistReplaceRecord(id) {
return request({
url: '/custom/orderNutritionistReplaceRecord/' + id,
method: 'get'
})
}
// 新增订单营养师、售后更换记录
export function addOrderNutritionistReplaceRecord(data) {
return request({
url: '/custom/orderNutritionistReplaceRecord',
method: 'post',
data: data
})
}
// 修改订单营养师、售后更换记录
export function updateOrderNutritionistReplaceRecord(data) {
return request({
url: '/custom/orderNutritionistReplaceRecord',
method: 'put',
data: data
})
}
// 删除订单营养师、售后更换记录
export function delOrderNutritionistReplaceRecord(id) {
return request({
url: '/custom/orderNutritionistReplaceRecord/' + id,
method: 'delete'
})
}
// 导出订单营养师、售后更换记录
export function exportOrderNutritionistReplaceRecord(query) {
return request({
url: '/custom/orderNutritionistReplaceRecord/export',
method: 'get',
params: query
})
}

15
stdiet-ui/src/components/OrderDrawer/index.vue
View File

@ -109,6 +109,14 @@
@click="handleOnDeleteClick(scope.row)"
>删除</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleOnReplaceRecordClick(scope.row)"
v-hasPermi="['custom:orderNutritionistReplaceRecord:list']"
>更换记录</el-button
>
</template>
</el-table-column>
</el-table>
@ -121,6 +129,8 @@
<edit-order-dialog ref="cusEditOrderDialogRef" />
<order-detail ref="orderDetailRef" />
<!-- 订单营养师、售后更换记录 -->
<nutritionistReplaceRecord ref="replaceRecordRef"></nutritionistReplaceRecord>
</div>
</template>
<script>
@ -128,6 +138,7 @@ import { listOrder, delOrder } from "@/api/custom/order";
import OrderEdit from "@/components/OrderEdit";
import OrderAdd from "@/components/OrderAdd";
import OrderDetail from "@/components/OrderDetail";
import NutritionistReplaceRecord from "@/components/OrderNutritionistReplaceRecord";
import { mapGetters } from "vuex";
import { checkPermi } from "@/utils/permission";
@ -137,6 +148,7 @@ export default {
"edit-order-dialog": OrderEdit,
"order-detail": OrderDetail,
"create-order-dialog": OrderAdd,
"nutritionistReplaceRecord": NutritionistReplaceRecord
},
data() {
return {
@ -223,6 +235,9 @@ export default {
this.fetchOrderList(this.data.id);
});
},
handleOnReplaceRecordClick(data) {
this.$refs.replaceRecordRef.showDialog(data);
},
handleOnDeleteClick(data) {
const orderIds = data.orderId || this.ids;
this.$confirm(

320
stdiet-ui/src/components/OrderNutritionistReplaceRecord/index.vue Normal file
View File

@ -0,0 +1,320 @@
<template>
<el-dialog
:visible.sync="visible"
:title="dialogTitle"
append-to-body
@closed="onClosed"
width="1000px"
>
<div class="app-container">
<!--<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单ID" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['custom:orderNutritionistReplaceRecord:add']"
>新增</el-button>
</el-col>
<!--<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['custom:orderNutritionistReplaceRecord:edit']"
>修改</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['custom:orderNutritionistReplaceRecord:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderNutritionistReplaceRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="更换的营养师" align="center" prop="nutritionist" />
<el-table-column label="更换的售后" align="center" prop="afterSale" />
<el-table-column label="开始服务时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!--<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['custom:orderNutritionistReplaceRecord:edit']"
>修改</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['custom:orderNutritionistReplaceRecord:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改订单营养师、售后更换记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="营养师" prop="nutritionistId">
<el-select v-model="form.nutritionistId" placeholder="请选择更换的营养师">
<el-option
v-for="dict in nutritionistIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
<el-form-item label="售后" prop="afterSaleId">
<el-select v-model="form.afterSaleId" placeholder="请选择更换的售后">
<el-option
v-for="dict in afterSaleIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable size="small" style="width: 200px"
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</el-dialog>
</template>
<script>
import { listOrderNutritionistReplaceRecord, getOrderNutritionistReplaceRecord, delOrderNutritionistReplaceRecord, addOrderNutritionistReplaceRecord, updateOrderNutritionistReplaceRecord, exportOrderNutritionistReplaceRecord } from "@/api/custom/OrderNutritionistReplaceRecord";
import { mapGetters } from "vuex";
export default {
name: "OrderNutritionistReplaceRecord",
data() {
return {
dialogTitle:"",
visible: false,
orderData: null,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 订单营养师、售后更换记录表格数据
orderNutritionistReplaceRecordList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
},
computed: {
...mapGetters([
// 售后字典
"afterSaleIdOptions",
// 主营养师字典
"nutritionistIdOptions"
]),
},
methods: {
showDialog(data) {
if(data == undefined || data == null){
return;
}
this.orderData = data;
this.dialogTitle = "「"+data.orderTime+"-"+data.customer+"」订单营养师售后更换记录";
this.visible = true;
this.queryParams.orderId = this.orderData.orderId;
this.getList();
},
/** 查询订单营养师、售后更换记录列表 */
getList() {
this.loading = true;
listOrderNutritionistReplaceRecord(this.queryParams).then(response => {
this.orderNutritionistReplaceRecordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderId: null,
nutritionistId: null,
afterSaleId: null,
startTime: null,
createTime: null,
createBy: null,
updateTime: null,
updateBy: null,
delFlag: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单营养师、售后更换记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOrderNutritionistReplaceRecord(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单营养师、售后更换记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.orderId = this.orderData.orderId;
if (this.form.id != null) {
updateOrderNutritionistReplaceRecord(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addOrderNutritionistReplaceRecord(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除订单营养师、售后更换记录编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delOrderNutritionistReplaceRecord(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有订单营养师、售后更换记录数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportOrderNutritionistReplaceRecord(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
},
onClosed() {
this.orderData = null;
this.visible = false;
}
}
};
</script>