fix
This commit is contained in:
parent
ad76f4b307
commit
0ea8d27694
|
|
@ -2,6 +2,7 @@ package com.bonus.zlpt.order.controller;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
|
import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
|
||||||
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
|
import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
|
||||||
|
|
@ -98,6 +99,7 @@ public class OrderInfoController extends BaseController
|
||||||
public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
|
public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
|
||||||
{
|
{
|
||||||
OrderInfoVo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderId);
|
OrderInfoVo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderId);
|
||||||
|
if (Objects.nonNull(orderInfo)) {
|
||||||
Map map1 = (Map) remoteDevInfoService.getInfo(orderInfo.getMaId());
|
Map map1 = (Map) remoteDevInfoService.getInfo(orderInfo.getMaId());
|
||||||
if (map1 != null) {
|
if (map1 != null) {
|
||||||
Map map2 = (Map) map1.get(DATA_TAG);
|
Map map2 = (Map) map1.get(DATA_TAG);
|
||||||
|
|
@ -123,6 +125,7 @@ public class OrderInfoController extends BaseController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return success(orderInfo);
|
return success(orderInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue