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-15 17:33:45 +08:00
parent 373606825e
commit de09e5bf81
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,8 @@ public class OrderDetailController extends BaseController {
OrderStandard orderStandard = new OrderStandard(); OrderStandard orderStandard = new OrderStandard();
orderStandard.setStandardName(orderGoods.getGoodsName()); orderStandard.setStandardName(orderGoods.getGoodsName());
orderStandard.setStandardNum(orderGoods.getGoodsNum()); orderStandard.setStandardNum(orderGoods.getGoodsNum());
orderStandard.setServerNum(orderGoods.getServerGoodsNum() == null ? 0 : orderGoods.getServerGoodsNum());
orderStandard.setWaitServerNum(orderStandard.getStandardNum() - orderStandard.getServerNum());
standardList.add(orderStandard); standardList.add(orderStandard);
} }
@ -145,6 +147,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setStandardList(standardList); orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(customerAddress.getAddress());
orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setCreateTime(detail.getCreateTime());
return AjaxResult.success(orderListResponse); return AjaxResult.success(orderListResponse);
}catch (Exception e){ }catch (Exception e){

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

@ -46,5 +46,7 @@ public class OrderListResponse {
private String address; private String address;
private Date createTime;
private List<OrderStandard> standardList; private List<OrderStandard> standardList;
} }

2
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -51,5 +51,5 @@ public class OrderDetail extends BaseEntity {
@Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING) @Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING)
private Date workFinishTime; private Date workFinishTime;
private Date createTime;
} }