diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java index a5abc9e..2e44b22 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java @@ -4,6 +4,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail; import lombok.Data; import java.math.BigDecimal; +import java.util.Collection; import java.util.List; /** @@ -18,7 +19,7 @@ public class OrderVo { private String tableName; private String shopQrcode; - private List details; + private Collection details; private String cartListString; private String orderNo; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 579adaa..d28137d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -308,7 +308,7 @@ public class OrderService { orderVo.setStatus(orderInfo.getStatus()); //TODO 增加商家二维码 orderVo.setShopQrcode(shopInfo.getShopQrcode()); - orderVo.setDetails((List) detailHashMap.values()); + orderVo.setDetails(detailHashMap.values()); orderVo.setOrderNo(orderInfo.getOrderNo()); orderVo.setTime(orderInfo.getCreatedAt()); if (orderInfo.getStatus().equals("paying") || orderInfo.getStatus().equals("unpaid")) {