12/4

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

@@ -32,6 +32,7 @@ public class LpkReserveOrderCardVo implements Vo {
     private String state;//提货状态
     private List<GoodsVo> goodsVos;
     private String goods;
+    private String serialNumber;
 
     public String getState() {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");

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

@@ -31,7 +31,7 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
             "        end stateValue,\n" +
             "        bag.dateStart as dateStart\n" +
             "        ,bag.dateEnd as dateEnd\n" +
-            "        ,bag.name as pname,card.state as states\n" +
+            "        ,bag.name as pname,card.state as states,card.serialNumber as serialNumber\n" +
             "        FROM\n" +
             "        lpk_giftcard card\n" +
             "        LEFT JOIN lpk_giftbag bag on card.giftbagSid=bag.sid" +

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

@@ -55,7 +55,7 @@
         o.cardSid as cardSid,
         o.sid as orderSid,
         o.userName,
-        o.userPhone,
+        o.userPhone,c.serialNumber as serialNumber,
         o.sid
         FROM lpk_reserve_order AS o
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid