Commit bfc438b4 by 王力

Merge branch 'feature_mvp616_wangl' into 'develop'

Feature mvp616 wangl

See merge request !61
2 parents 1000c543 d8931caf
...@@ -12,5 +12,5 @@ public class OrderServiceDetailResp { ...@@ -12,5 +12,5 @@ public class OrderServiceDetailResp {
private String risk; private String risk;
private String riskDesc; private String riskDesc;
private String location; private String location;
private List<KV> orderServiceItems; private List<KV> items;
} }
...@@ -48,10 +48,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -48,10 +48,11 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
OrderServiceDetailResp res = new OrderServiceDetailResp(); OrderServiceDetailResp res = new OrderServiceDetailResp();
res.setOrderId(orderId); res.setOrderId(orderId);
res.setRisk(""); res.setRisk("");
res.setRiskDesc("");
res.setStatusDesc("打开"); res.setStatusDesc("打开");
res.setStatus(order.getStatus()); res.setStatus(order.getStatus());
res.setLocation(String.format("%s,%s", order.getX(), order.getY())); res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
res.setOrderServiceItems(items); res.setItems(items);
return Result.success(res); return Result.success(res);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!