12/4

src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java

@@ -1,6 +1,7 @@
 package com.yxt.yyth.api.lpkreserveorder;
 
 import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
@@ -15,6 +16,8 @@ import java.util.Date;
 @Data
 public class LpkReserveOrderCardVo implements Vo {
     private String code; //卡号
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date reserveDate; //预约时间
     private String store; //提货门店
     private String bagName; //礼包

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -388,6 +388,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ResultBean rb = new ResultBean().fail();
         LpkGiftCard card = baseMapper.selectOne(new QueryWrapper<LpkGiftCard>().eq("sid", cardSid));
         card.setState(state);
+        card.setIsReservation("0");
         baseMapper.updateById(card);
         return rb.success().setData("成功");
     }

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -53,7 +53,9 @@
         s.`name` as store,
         b.`name` as bagName,
         o.cardSid as cardSid,
-        o.sid as orderSid
+        o.sid as orderSid,
+        o.userName,
+        o.userPhone
         FROM lpk_reserve_order AS o
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid