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

补充消费者名称+意向服务时间

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-06-09 16:04:46 +08:00
parent 0feed790ce
commit 75590aa92b
2 changed files with 10 additions and 0 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

@ -102,6 +102,9 @@ public class OrderMasterController extends BaseController {
// 师傅信息
Worker worker = workerService.selectById(master.getWorkerId());
// 消费者信息
Customer customer = customerService.selectByCustomerId(master.getCustomerId());
// 商品规格及信息
List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId());
@ -131,6 +134,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setWorkerName(worker.getName());
orderListResponse.setCustomerName(customer.getName());
orderListResponse.setServerTime(master.getRevTime());
orderListResponse.setOrderStatus(master.getOrderStatus());
orderListResponse.setPayStatus(master.getPayStatus());
orderListResponse.setPayType(master.getPayType());

5
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 lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -15,6 +16,10 @@ public class OrderListResponse {
private String workerName;
private String customerName;
private Date serverTime;
private String goodsName;
private Integer orderStatus;