clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

加价/售后列表

This commit is contained in:
clunt 2022-09-25 23:08:22 +08:00
parent 7a0eb20a76
commit f874c268da
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -10,6 +10,7 @@ import com.ghy.common.enums.ImgType;
import com.ghy.common.enums.OrderStatus; import com.ghy.common.enums.OrderStatus;
import com.ghy.common.enums.PayStatus; import com.ghy.common.enums.PayStatus;
import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.StringUtils;
import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerAddressService;
@ -52,9 +53,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -290,6 +289,7 @@ public class OrderDetailController extends BaseController {
@ResponseBody @ResponseBody
public TableDataInfo afterServiceList(@RequestBody OrderDetail orderDetail) { public TableDataInfo afterServiceList(@RequestBody OrderDetail orderDetail) {
List<AfterServiceRecord> afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(new AfterServiceRecord()); List<AfterServiceRecord> afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(new AfterServiceRecord());
Map<Long, List<AfterServiceRecord>> detailRecordMap = afterServiceRecordList.stream().collect(Collectors.groupingBy(record->record.getOrderDetailId()));
// 踢重后的子单ids // 踢重后的子单ids
List<Long> detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); List<Long> detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList());
StringBuilder orderDetailIds = new StringBuilder(); StringBuilder orderDetailIds = new StringBuilder();
@ -297,8 +297,10 @@ public class OrderDetailController extends BaseController {
orderDetailIds.append(id).append(","); orderDetailIds.append(id).append(",");
}); });
String ids = orderDetailIds.toString(); String ids = orderDetailIds.toString();
if(ids.length() > 0){ if(StringUtils.isNotEmpty(ids)){
orderDetail.setOrderDetailIds(ids.substring(0, -1)); orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1));
}else {
orderDetail.setOrderDetailIds("0");
} }
startPage(); startPage();
List<OrderListResponse> orderListResponses = new ArrayList<>(); List<OrderListResponse> orderListResponses = new ArrayList<>();
@ -375,6 +377,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setCustomerRemark(orderMaster.getRemark()); orderListResponse.setCustomerRemark(orderMaster.getRemark());
orderListResponse.setOrderType(detail.getOrderType()); orderListResponse.setOrderType(detail.getOrderType());
orderListResponse.setIsOverTime(isOverTime); orderListResponse.setIsOverTime(isOverTime);
orderListResponse.setAfterServiceRecordList(detailRecordMap.get(detail.getId()));
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });
return voDataTable(orderListResponses, list); return voDataTable(orderListResponses, list);

13
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -210,8 +210,10 @@ public class OrderMasterController extends BaseController {
orderDetailIds.append(id).append(","); orderDetailIds.append(id).append(",");
}); });
String ids = orderDetailIds.toString(); String ids = orderDetailIds.toString();
if(ids.length() > 0){ if(StringUtils.isNotEmpty(ids)){
orderDetail.setOrderDetailIds(ids.substring(0, -1)); orderDetail.setOrderDetailIds(ids.substring(0, ids.length()-1));
}else {
orderDetail.setOrderDetailIds("0");
} }
// 所有售后的子单 // 所有售后的子单
List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
@ -220,8 +222,11 @@ public class OrderMasterController extends BaseController {
.collect(Collectors.toList()).forEach(id->{ .collect(Collectors.toList()).forEach(id->{
orderMasterIds.append(id).append(","); orderMasterIds.append(id).append(",");
}); });
if(orderMasterIds.toString().length()>0){ String orderIds = orderMasterIds.toString();
orderMaster.setOrderMasterIds(orderMasterIds.substring(0, -1)); if(StringUtils.isNotEmpty(orderIds)){
orderMaster.setOrderMasterIds(orderIds.substring(0, orderIds.length()-1));
}else {
orderMaster.setOrderMasterIds("0");
} }
startPage(); startPage();

3
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -2,6 +2,7 @@ package com.ghy.web.pojo.vo;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.order.domain.AfterServiceRecord;
import com.ghy.payment.domain.OrderTimeoutRecord; import com.ghy.payment.domain.OrderTimeoutRecord;
import lombok.Data; import lombok.Data;
@ -78,4 +79,6 @@ public class OrderListResponse {
private List<String> finishImgList; private List<String> finishImgList;
private List<AfterServiceRecord> afterServiceRecordList;
} }

2
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -120,7 +120,7 @@
AND om.create_time &lt; #{createTimeEnd} AND om.create_time &lt; #{createTimeEnd}
</if> </if>
<if test="orderMasterIds != null"> <if test="orderMasterIds != null">
AND om.id in (#{orderMasterIds}); AND om.id in (#{orderMasterIds})
</if> </if>
</where> </where>
order by om.create_time order by om.create_time