|
|
|
@ -138,8 +138,8 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Map<String, Object> orderDetail(String batchcode) { |
|
|
|
Map retmap =new HashMap(); |
|
|
|
public List orderDetail(String batchcode) { |
|
|
|
List retList = new ArrayList(); |
|
|
|
// 订单详情及产品信息
|
|
|
|
List<OrderDetailVo> ordvList =orderGoodsDetailMapper.getOrderDetailVo(batchcode); |
|
|
|
if(ordvList==null){ |
|
|
|
@ -148,6 +148,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
}else{ |
|
|
|
// 枚举所有的订单详情
|
|
|
|
for(OrderDetailVo dv:ordvList){ |
|
|
|
Map retmap = new HashMap(); |
|
|
|
// 商品图片
|
|
|
|
if(StringUtils.isNotBlank(dv.getGoods_image())){ |
|
|
|
//todo 远程获取图
|
|
|
|
@ -204,10 +205,12 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
} |
|
|
|
retmap.put("gather_arr",gatherList); |
|
|
|
retmap.put("oneSource",oneSource); |
|
|
|
//
|
|
|
|
retList.add(retmap); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return retmap; |
|
|
|
return retList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|