From 01c6e5753c1e4c98877ec234258aa3f4f70e129c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 29 Aug 2024 10:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/entity/TbOrderInfo.java | 4 +++- .../system/cashierservice/service/OrderService.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java index 60a3dcf..3f34ec1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java @@ -101,12 +101,14 @@ public class TbOrderInfo implements Serializable { private List detailList; private String winnnerNo; private String isWinner; + private String shopName; //根据状态返回 需付款 已付款 未付款 已退 private String description; - public void setDescription() { + public void setDescription(String shopName) { + this.shopName = shopName; switch (status) { case "closed": this.description = "已付款"; 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 3455262..ccb8505 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -220,9 +220,11 @@ public class OrderService { // } PageHelper.startPage(page, size); List tbOrderInfos = orderInfoMapper.selectByUserId(userId, status); - + String shopName = ""; for (TbOrderInfo orderInfo : tbOrderInfos) { - orderInfo.setDescription(); + TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId())); + shopName = tbShopInfo.getShopName(); + orderInfo.setDescription(shopName); List list = tbOrderDetailMapper.selectAllByOrderId(orderInfo.getId()); int num = 0; for (TbOrderDetail orderDetail : list) {