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

主订单查询问题修复

This commit is contained in:
donqi 2022-06-29 18:08:35 +08:00
parent 380d9729fe
commit 84fd473b76
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,8 +235,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerName(customer.getName());
orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setCustomerPhone(customer.getPhone());
orderListResponse.setOrderStatus(orderMaster.getOrderStatus()); orderListResponse.setOrderStatus(orderMaster.getOrderStatus());
@ -248,6 +248,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
orderListResponse.setCreateTime(orderMaster.getCreateTime()); orderListResponse.setCreateTime(orderMaster.getCreateTime());
orderListResponse.setRemark(orderMaster.getRemark());
orderListResponse.setOrderStandardDetailList(orderStandardDetails); orderListResponse.setOrderStandardDetailList(orderStandardDetails);
return AjaxResult.success(orderListResponse); return AjaxResult.success(orderListResponse);

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

@ -57,6 +57,8 @@ public class OrderListResponse {
private Date createTime; private Date createTime;
private String remark;
private List<OrderStandard> standardList; private List<OrderStandard> standardList;
private List<OrderStandardDetail> orderStandardDetailList; private List<OrderStandardDetail> orderStandardDetailList;