师傅端订单详情接口修改
This commit is contained in:
parent
373606825e
commit
de09e5bf81
|
|
@ -121,6 +121,8 @@ public class OrderDetailController extends BaseController {
|
|||
OrderStandard orderStandard = new OrderStandard();
|
||||
orderStandard.setStandardName(orderGoods.getGoodsName());
|
||||
orderStandard.setStandardNum(orderGoods.getGoodsNum());
|
||||
orderStandard.setServerNum(orderGoods.getServerGoodsNum() == null ? 0 : orderGoods.getServerGoodsNum());
|
||||
orderStandard.setWaitServerNum(orderStandard.getStandardNum() - orderStandard.getServerNum());
|
||||
standardList.add(orderStandard);
|
||||
}
|
||||
|
||||
|
|
@ -145,6 +147,7 @@ public class OrderDetailController extends BaseController {
|
|||
orderListResponse.setStandardList(standardList);
|
||||
orderListResponse.setAddress(customerAddress.getAddress());
|
||||
orderListResponse.setServerTime(detail.getRevTime());
|
||||
orderListResponse.setCreateTime(detail.getCreateTime());
|
||||
|
||||
return AjaxResult.success(orderListResponse);
|
||||
}catch (Exception e){
|
||||
|
|
|
|||
|
|
@ -46,5 +46,7 @@ public class OrderListResponse {
|
|||
|
||||
private String address;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private List<OrderStandard> standardList;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,5 +51,5 @@ public class OrderDetail extends BaseEntity {
|
|||
@Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING)
|
||||
private Date workFinishTime;
|
||||
|
||||
|
||||
private Date createTime;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue