Browse Source

修正集合类型

master
xyiege 4 years ago
parent
commit
38d6b6134d
  1. 4
      src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
  2. 2
      src/main/java/cn/chjyj/szwh/service/OrderService.java
  3. 9
      src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

4
src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java

@ -67,10 +67,10 @@ public class AdminOrderController extends BaseController {
JSONObject json = JSONObject.parseObject(request);
String batchcode = json.getString("batchcode");
// 订单详情
Map orderMap = orderService.orderDetail(batchcode);
List orderDetailList = orderService.orderDetail(batchcode);
jsonObject.put("code",200);
jsonObject.put("msg","成功");
jsonObject.put("data",orderMap);
jsonObject.put("data",orderDetailList);
return jsonObject;
}

2
src/main/java/cn/chjyj/szwh/service/OrderService.java

@ -28,7 +28,7 @@ public interface OrderService {
* @param batchcode
* @return
*/
Map<String,Object> orderDetail(String batchcode);
List orderDetail(String batchcode);
/**
* 根据编号查询订单信息

9
src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@ -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

Loading…
Cancel
Save