From c9bb257c291b4186f3e8c4e063fb36317ae1b3ae Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 31 Jan 2024 18:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VegeCellarReserveOrderVo.java             |  3 +++
 .../VegeCellarReserveOrderMapper.xml          |  4 +++-
 .../VegeCellarReserveOrderService.java        | 20 +++++++++----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
index ffce2d8..eecacd6 100644
--- a/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
+++ b/src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java
@@ -21,6 +21,8 @@ public class VegeCellarReserveOrderVo implements Vo {
     private String store; //门店
     private String storeSid; //门店
     private String storeName; //门店
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8")
     private Date reserveDate; //预约时间
     private String bagName; //礼包
@@ -41,4 +43,5 @@ public class VegeCellarReserveOrderVo implements Vo {
     private String stateValue;
     private String affiliationValue;
     private String reserveCode;
+    private boolean showLsit=false;
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
index 885b2de..887c78c 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml
@@ -239,6 +239,7 @@
 <!--    </select>-->
     <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo">
         SELECT
+        o.createTime as createTime,
         o.reserveCode,
         o.sid as sid,
         o.storeName,
@@ -255,7 +256,8 @@
         when 1001045 then '企业菜窖'
         end affiliationValue,
         s.name as storeName,
-        s.address as address
+        s.address as address,
+        s.phone as linkPhone
         FROM
         vege_cellar_reserve_order AS o
         left join lpk_store s on s.sid=o.storeSid
diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
index 9e352ed..c07ad0c 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java
@@ -290,16 +290,16 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
             List<VegeCellarReserveDetails> goods = vegeCellarReserveDetailsService.selByOrderSids(vo.getSid());
             for (VegeCellarReserveDetails goods1 : goods) {
                 LpkGoods lpkGoods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", goods1.getGoodsSid()));
-//                OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
-//                orderGoodsVo.setGoodName(lpkGoods.getName());
-//                orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
-//                orderGoodsVo.setUnitName(lpkGoods.getUnitName());
-//                goodsVo.add(orderGoodsVo);
-                if (StringUtils.isBlank(vo.getGoodss())) {
-                    vo.setGoodss(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
-                } else {
-                    vo.setGoodss(vo.getGoodss() + "    " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
-                }
+                OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
+                orderGoodsVo.setGoodName(lpkGoods.getName());
+                orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
+                orderGoodsVo.setUnitName(lpkGoods.getUnitName());
+                goodsVo.add(orderGoodsVo);
+//                if (StringUtils.isBlank(vo.getGoodss())) {
+//                    vo.setGoodss(lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
+//                } else {
+//                    vo.setGoodss(vo.getGoodss() + "    " + lpkGoods.getName() + "：" + goods1.getNum() + lpkGoods.getUnitName());
+//                }
             }
             vo.setGoodsVo(goodsVo);
         }