diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 624f50f3..bafec0b2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -27,6 +27,7 @@ import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialMasterService; import com.ghy.web.pojo.vo.OrderDetailsResponseVo; import com.ghy.web.pojo.vo.OrderListResponse; +import com.ghy.web.pojo.vo.OrderStandard; import com.ghy.worker.domain.Worker; import com.ghy.worker.service.WorkerService; import com.github.pagehelper.PageInfo; @@ -95,7 +96,7 @@ public class OrderMasterController extends BaseController { list.forEach(master->{ // 初始化属性 OrderListResponse orderListResponse = new OrderListResponse(); - List> standardList = new ArrayList<>(); + List standardList = new ArrayList<>(); // 师傅信息 Worker worker = workerService.selectById(master.getWorkerId()); @@ -113,9 +114,10 @@ public class OrderMasterController extends BaseController { CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); for(GoodsStandard goodsStandard : goodsStandardList){ - Map standardMap = new HashMap<>(); - standardMap.put(goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum()); - standardList.add(standardMap); + OrderStandard orderStandard = new OrderStandard(); + orderStandard.setStandardName(goodsStandard.getGoodsStandardName()); + orderStandard.setStandardNum(goodsStandard.getGoodsNum()); + standardList.add(orderStandard); } // 编辑返回属性 diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index cc90be2c..d2f08a3a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -33,5 +33,5 @@ public class OrderListResponse { private String address; - private List> standardList; + private List standardList; } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java new file mode 100644 index 00000000..5afee7a4 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java @@ -0,0 +1,12 @@ +package com.ghy.web.pojo.vo; + +import lombok.Data; + +@Data +public class OrderStandard { + + private String standardName; + + private Integer standardNum; + +}