Skip to content

O
order-group
Commit b24abbb0 by huiyang.chen
Options

Merge branch 'feature-2020/8/6-McCafe-会阳' into qa

parents fc09abd2 ca904c57
Showing with 6 additions and 0 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -1017,6 +1017,12 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1017,6 +1017,12 @@ public class OrderServiceImpl implements Orderservice {
responseMap.put("orderStatus", orderViewStatusDesc.getOrderStatus()); responseMap.put("orderStatus", orderViewStatusDesc.getOrderStatus());
responseMap.put("takeCode",""); responseMap.put("takeCode","");
responseMap.put("queueIndex",""); responseMap.put("queueIndex","");
String extInfo = orderBean.getExtInfo();
OrderExtInfoDto orderExtInfoDto = null;
if (StringUtils.isNotBlank(extInfo)) {
orderExtInfoDto = gson.fromJson(extInfo, OrderExtInfoDto.class);
}
responseMap.put("payVoucher",orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
//非外卖单才获取取餐码和排队人数 //非外卖单才获取取餐码和排队人数
if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getType()) ){ if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getType()) ){
if (!(OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus()) if (!(OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment