From 05c0bcba80bd51d99bba1be1d697f1ed6febd3c0 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Thu, 9 Jun 2022 14:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=BB=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderMasterController.java | 33 ++++++++++++------- .../ghy/web/pojo/vo/OrderListResponse.java | 9 ++--- .../ghy/web/pojo/vo/WorkerOrderResponse.java | 7 ++++ .../com/ghy/order/domain/OrderMaster.java | 3 ++ 4 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerOrderResponse.java 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 464efe9e..737b27c2 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 @@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,6 +68,8 @@ public class OrderMasterController extends BaseController { @Autowired private OrderGoodsService orderGoodsService; @Autowired + private CustomerAddressService addressService; + @Autowired private GoodsService goodsService; @Autowired private CustomerAddressService customerAddressService; @@ -90,28 +93,34 @@ public class OrderMasterController extends BaseController { List orderListResponses = new ArrayList<>(); List list = orderMasterService.selectOrderMasterList(orderMaster); list.forEach(master->{ + // 初始化属性 OrderListResponse orderListResponse = new OrderListResponse(); - // 添加师傅信息 + List> standardList = new ArrayList<>(); + + // 师傅信息 Worker worker = workerService.selectById(master.getWorkerId()); + // 商品信息 OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId()); - // 添加商品信息 + // 规格信息 List goodsStandardList = goodsStandardService.selectByGoodsStandardId(orderGoods.getGoodsId()); - if(!CollectionUtils.isEmpty(goodsStandardList)){ - orderGoods.setGoodsStandard(goodsStandardList.get(0)); - orderGoods.setGoodsLogoUrl(goodsService.selectById(goodsStandardList.get(0).getGoodsId()).getGoodsImgUrl()); - } - - // 添加订单商品信息 - master.setOrderGoods(orderGoods); + // 财务信息 FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId()); + // 地址信息 + CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); + + for(GoodsStandard goodsStandard : goodsStandardList){ + Map standardMap = new HashMap<>(); + standardMap.put(goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum()); + standardList.add(standardMap); + } + + // 编辑返回属性 orderListResponse.setOrderMasterId(master.getId()); - orderListResponse.setNum(orderGoods.getGoodsNum()); orderListResponse.setGoodsName(orderGoods.getGoodsName()); - orderListResponse.setStandardName(orderGoods.getGoodsStandard().getGoodsStandardName()); orderListResponse.setGoodsLogoUrl(orderGoods.getGoodsLogoUrl()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); @@ -121,6 +130,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setPayStatus(master.getPayStatus()); orderListResponse.setPayType(master.getPayType()); orderListResponse.setOrderMasterCode(master.getCode()); + orderListResponse.setStandardList(standardList); + orderListResponse.setAddress(customerAddress.getAddress()); orderListResponses.add(orderListResponse); }); 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 b40a9150..cc90be2c 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 @@ -3,6 +3,8 @@ package com.ghy.web.pojo.vo; import lombok.Data; import java.math.BigDecimal; +import java.util.List; +import java.util.Map; @Data public class OrderListResponse { @@ -15,16 +17,12 @@ public class OrderListResponse { private String goodsName; - private String standardName; - private Integer orderStatus; private Integer payStatus; private Integer payType; - private Integer num; - private BigDecimal totalMoney; private BigDecimal payMoney; @@ -33,4 +31,7 @@ public class OrderListResponse { private String goodsLogoUrl; + private String address; + + private List> standardList; } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerOrderResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerOrderResponse.java new file mode 100644 index 00000000..78514da0 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerOrderResponse.java @@ -0,0 +1,7 @@ +package com.ghy.web.pojo.vo; + +public class WorkerOrderResponse { + + + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index f6296753..265915c5 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -29,6 +29,9 @@ public class OrderMaster extends BaseEntity { @Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC) private Long customerId; + @Excel(name = "地址id", cellType = Excel.ColumnType.NUMERIC) + private Long addressId; + @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC) private Integer orderType;