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

子单详情查询超时记录和加价记录

This commit is contained in:
donqi 2022-11-30 00:38:18 +08:00
parent 35d5697e03
commit 7659b3de48
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,9 @@ import com.ghy.payment.service.FinancialDetailService;
import com.ghy.payment.service.FinancialMasterService;
import com.ghy.payment.service.OrderFineRecordService;
import com.ghy.system.domain.SysArea;
import com.ghy.system.domain.SysDeptConfig;
import com.ghy.system.service.ISysAreaService;
import com.ghy.system.service.ISysDeptConfigService;
import com.ghy.web.pojo.vo.OrderChangePriceRequest;
import com.ghy.web.pojo.vo.OrderListResponse;
import com.ghy.web.pojo.vo.OrderStandard;
@ -103,6 +105,8 @@ public class OrderDetailController extends BaseController {
private IOrderAssessLabelService orderAssessLabelService;
@Autowired
private FinancialMasterService financialMasterService;
@Autowired
private ISysDeptConfigService sysDeptConfigService;
@RequiresPermissions("order:detail:view")
@GetMapping()
@ -219,6 +223,26 @@ public class OrderDetailController extends BaseController {
afterServiceRecord.setOrderDetailId(detail.getId());
List<AfterServiceRecord> afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
// 超时记录
OrderTimeoutRecord timeoutRecordQry = new OrderTimeoutRecord();
timeoutRecordQry.setOrderDetailId(detail.getId());
List<OrderTimeoutRecord> orderTimeoutRecords = orderFineRecordService.selectList(timeoutRecordQry);
SysDeptConfig sysDeptConfig = sysDeptConfigService.selectByDeptId(request.getDeptId());
orderTimeoutRecords.stream().forEach(timeoutRecord -> {
switch (timeoutRecord.getOrderStatus()) {
case 0: timeoutRecord.setPayMoney(sysDeptConfig.getPlainOutTime()); break;
case 1: timeoutRecord.setPayMoney(sysDeptConfig.getGoOutTime()); break;
case 2:
case 3: timeoutRecord.setPayMoney(sysDeptConfig.getGoingOutTime()); break;
default: break;
}
});
// 查询加价记录
FinancialChangeRecord changeRecordQry = new FinancialChangeRecord();
changeRecordQry.setOrderDetailId(detail.getId());
List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectFinancialChangeRecordList(changeRecordQry);
// 编辑返回属性
orderListResponse.setOrderDetailId(detail.getId());
orderListResponse.setOrderDetailCode(detail.getCode());
@ -253,6 +277,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setFinishImgList(finishImgList);
orderListResponse.setWorkerRemark(detail.getRemark());
orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
orderListResponse.setOrderTimeoutRecords(orderTimeoutRecords);
orderListResponse.setFinancialChangeRecords(financialChangeRecords);
return AjaxResult.success(orderListResponse);
} catch (Exception e) {

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

@ -3,6 +3,7 @@ package com.ghy.web.pojo.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.order.domain.AfterServiceRecord;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.OrderTimeoutRecord;
import lombok.Data;
@ -106,4 +107,6 @@ public class OrderListResponse {
private Integer shelveStatus;
private Integer ledgerAccountStatus;
private List<FinancialChangeRecord> financialChangeRecords;
}

3
ghy-payment/src/main/java/com/ghy/payment/domain/OrderTimeoutRecord.java
View File

@ -2,6 +2,7 @@ package com.ghy.payment.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -37,6 +38,8 @@ public class OrderTimeoutRecord {
*/
private Date createTime;
private BigDecimal payMoney;
public OrderTimeoutRecord() {
}