diff --git a/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
index edaab17..82755c6 100644
--- a/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
+++ b/src/main/java/com/example/gb/bean/vo/LiveOrderVO.java
@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -20,4 +22,7 @@ public class LiveOrderVO {
     private String liveName;
     private String channelId;
     private String channelName;
+
+    private Date beginTime;
+    private Date endTime;
 }
diff --git a/src/main/java/com/example/gb/bean/vo/LivePindaoVO.java b/src/main/java/com/example/gb/bean/vo/LivePindaoVO.java
new file mode 100644
index 0000000..929aa64
--- /dev/null
+++ b/src/main/java/com/example/gb/bean/vo/LivePindaoVO.java
@@ -0,0 +1,13 @@
+package com.example.gb.bean.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LivePindaoVO {
+    private Integer id;
+    private String title;
+}
diff --git a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
index 88e41ea..caef34a 100644
--- a/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
+++ b/src/main/java/com/example/gb/controller/GoldbeanConsumeController.java
@@ -1,7 +1,9 @@
 package com.example.gb.controller;
 
 //import com.github.pagehelper.PageInfo;
+import com.example.gb.bean.vo.LiveOrderVO;
 import com.example.gb.service.GoldbeanConsumeService;
+import com.example.gb.service.GoldbeanGiftService;
 import com.example.gb.util.Page;
 import com.example.gb.util.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,12 +16,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/admin/consume")
 public class GoldbeanConsumeController {
     private GoldbeanConsumeService goldbeanConsumeService;
+    private GoldbeanGiftService goldbeanGiftService;
     @Autowired
     public void setGoldbeanConsumeService(GoldbeanConsumeService goldbeanConsumeService) {
         this.goldbeanConsumeService = goldbeanConsumeService;
     }
+    @Autowired
+    public void setGoldbeanGiftService(GoldbeanGiftService goldbeanGiftService) {
+        this.goldbeanGiftService = goldbeanGiftService;
+    }
+    //直播消费列表
     @GetMapping("/live/list")
-    public Result liveList(@RequestBody Page page){
+    public Result liveList(@RequestBody Page<LiveOrderVO> page){
         return goldbeanConsumeService.getLiveConsumeList(page);
     }
+    //礼物清单
+    @GetMapping("/live/giftList")
+    public Result liveGiftList(){
+        return goldbeanGiftService.getGiftList();
+    }
 }
diff --git a/src/main/java/com/example/gb/controller/GoldbeanPindaoController.java b/src/main/java/com/example/gb/controller/GoldbeanPindaoController.java
new file mode 100644
index 0000000..163b5d3
--- /dev/null
+++ b/src/main/java/com/example/gb/controller/GoldbeanPindaoController.java
@@ -0,0 +1,18 @@
+package com.example.gb.controller;
+
+import com.example.gb.service.GoldbeanPindaoService;
+import com.example.gb.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/admin/pindao")
+public class GoldbeanPindaoController {
+    @Autowired
+    private GoldbeanPindaoService goldbeanPindaoService;
+    @RequestMapping("/list")
+    public Result list(){
+        return goldbeanPindaoService.getPindaoList();
+    }
+}
diff --git a/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java b/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java
index e592c8e..1560702 100644
--- a/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java
+++ b/src/main/java/com/example/gb/dao/GoldbeanConsumeMapper.java
@@ -7,5 +7,5 @@ import java.util.List;
 
 @Mapper
 public interface GoldbeanConsumeMapper {
-    List<LiveOrderVO> getLiveConsumeList();
+    List<LiveOrderVO> getLiveConsumeList(LiveOrderVO liveOrderVO);
 }
diff --git a/src/main/java/com/example/gb/dao/GoldbeanGiftMapper.java b/src/main/java/com/example/gb/dao/GoldbeanGiftMapper.java
new file mode 100644
index 0000000..a755ea2
--- /dev/null
+++ b/src/main/java/com/example/gb/dao/GoldbeanGiftMapper.java
@@ -0,0 +1,14 @@
+package com.example.gb.dao;
+
+import com.example.gb.bean.LiveGifts;
+import com.example.gb.bean.vo.LiveOrderVO;
+import com.example.gb.util.Result;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface GoldbeanGiftMapper {
+
+    List<LiveGifts> getGiftList();
+}
diff --git a/src/main/java/com/example/gb/dao/GoldbeanPindaoMapper.java b/src/main/java/com/example/gb/dao/GoldbeanPindaoMapper.java
new file mode 100644
index 0000000..1c6d954
--- /dev/null
+++ b/src/main/java/com/example/gb/dao/GoldbeanPindaoMapper.java
@@ -0,0 +1,12 @@
+package com.example.gb.dao;
+
+import com.example.gb.bean.LivePindao;
+import com.example.gb.bean.vo.LivePindaoVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface GoldbeanPindaoMapper {
+    List<LivePindaoVO> getPindaoList();
+}
diff --git a/src/main/java/com/example/gb/service/GoldbeanConsumeService.java b/src/main/java/com/example/gb/service/GoldbeanConsumeService.java
index 0a8e06d..d14d9b0 100644
--- a/src/main/java/com/example/gb/service/GoldbeanConsumeService.java
+++ b/src/main/java/com/example/gb/service/GoldbeanConsumeService.java
@@ -1,8 +1,9 @@
 package com.example.gb.service;
 
+import com.example.gb.bean.vo.LiveOrderVO;
 import com.example.gb.util.Page;
 import com.example.gb.util.Result;
 
 public interface GoldbeanConsumeService {
-    Result getLiveConsumeList(Page page);
+    Result getLiveConsumeList(Page<LiveOrderVO> page);
 }
diff --git a/src/main/java/com/example/gb/service/GoldbeanGiftService.java b/src/main/java/com/example/gb/service/GoldbeanGiftService.java
new file mode 100644
index 0000000..29e5b4b
--- /dev/null
+++ b/src/main/java/com/example/gb/service/GoldbeanGiftService.java
@@ -0,0 +1,7 @@
+package com.example.gb.service;
+
+import com.example.gb.util.Result;
+
+public interface GoldbeanGiftService {
+    Result getGiftList();
+}
diff --git a/src/main/java/com/example/gb/service/GoldbeanPindaoService.java b/src/main/java/com/example/gb/service/GoldbeanPindaoService.java
new file mode 100644
index 0000000..0316847
--- /dev/null
+++ b/src/main/java/com/example/gb/service/GoldbeanPindaoService.java
@@ -0,0 +1,7 @@
+package com.example.gb.service;
+
+import com.example.gb.util.Result;
+
+public interface GoldbeanPindaoService {
+    Result getPindaoList();
+}
diff --git a/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
index 16e7416..21b07b1 100644
--- a/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
+++ b/src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java
@@ -20,11 +20,10 @@ public class GoldbeanConsumeServiceImpl implements GoldbeanConsumeService {
         this.goldbeanConsumeMapper = goldbeanConsumeMapper;
     }
     @Override
-    public Result getLiveConsumeList(Page page) {
+    public Result getLiveConsumeList(Page<LiveOrderVO> page) {
         PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
-        List<LiveOrderVO> list = goldbeanConsumeMapper.getLiveConsumeList();
+        List<LiveOrderVO> list = goldbeanConsumeMapper.getLiveConsumeList(page.getData());
         PageInfo<LiveOrderVO> pageInfo = new PageInfo<>(list);
-        System.out.println("实际查询结果总数：" + pageInfo.getTotal() + "，当前页数据条数：" + pageInfo.getSize());
         return Result.success(pageInfo);
     }
 }
diff --git a/src/main/java/com/example/gb/service/impl/GoldbeanPindaoServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldbeanPindaoServiceImpl.java
new file mode 100644
index 0000000..5033989
--- /dev/null
+++ b/src/main/java/com/example/gb/service/impl/GoldbeanPindaoServiceImpl.java
@@ -0,0 +1,22 @@
+package com.example.gb.service.impl;
+
+import com.example.gb.bean.LivePindao;
+import com.example.gb.bean.vo.LivePindaoVO;
+import com.example.gb.dao.GoldbeanPindaoMapper;
+import com.example.gb.service.GoldbeanPindaoService;
+import com.example.gb.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class GoldbeanPindaoServiceImpl implements GoldbeanPindaoService {
+    @Autowired
+    private GoldbeanPindaoMapper goldbeanPindaoMapper;
+    @Override
+    public Result getPindaoList() {
+        List<LivePindaoVO> list =  goldbeanPindaoMapper.getPindaoList();
+        return Result.success(list);
+    }
+}
diff --git a/src/main/java/com/example/gb/service/impl/GoldbeanRechargeGiftServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldbeanRechargeGiftServiceImpl.java
new file mode 100644
index 0000000..f4683c8
--- /dev/null
+++ b/src/main/java/com/example/gb/service/impl/GoldbeanRechargeGiftServiceImpl.java
@@ -0,0 +1,24 @@
+package com.example.gb.service.impl;
+
+import com.example.gb.bean.LiveGifts;
+import com.example.gb.dao.GoldbeanGiftMapper;
+import com.example.gb.service.GoldbeanGiftService;
+import com.example.gb.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class GoldbeanRechargeGiftServiceImpl implements GoldbeanGiftService {
+    private GoldbeanGiftMapper goldbeanGiftMapper;
+    @Autowired
+    public void setGoldbeanGiftMapper(GoldbeanGiftMapper goldbeanGiftMapper) {
+        this.goldbeanGiftMapper = goldbeanGiftMapper;
+    }
+    @Override
+    public Result getGiftList() {
+        List<LiveGifts> giftList = goldbeanGiftMapper.getGiftList();
+        return Result.success(giftList);
+    }
+}
diff --git a/src/main/java/com/example/gb/util/Page.java b/src/main/java/com/example/gb/util/Page.java
index f06abc8..638d948 100644
--- a/src/main/java/com/example/gb/util/Page.java
+++ b/src/main/java/com/example/gb/util/Page.java
@@ -6,10 +6,11 @@ import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
-public class Page {
+public class Page <T>{
     private Integer pageSize;
     private Integer currentPage;
     private Integer total;
     private Integer totalPage;
     private Integer offSet;
+    private T Data;
 }
diff --git a/src/main/resources/mapper/GoldbeanConsumeMapper.xml b/src/main/resources/mapper/GoldbeanConsumeMapper.xml
index f2a5f67..719cf2b 100644
--- a/src/main/resources/mapper/GoldbeanConsumeMapper.xml
+++ b/src/main/resources/mapper/GoldbeanConsumeMapper.xml
@@ -21,8 +21,13 @@
         left join fx_member as fx on lgg.jwcode = fx.jwcode
         left join live_pindao as lp on lp.pd_id = l.channel_id
         left join live_gifts as lg on lgg.g_id = lg.id
-        where
-            lgg.status = true
-
+        <where>
+            <if test="jwcode != null">
+                and lgg.jwcode = #{jwcode}
+            </if>
+            <if test="liveId != null">
+                and lgg.live_id = #{liveId}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/GoldbeanGiftMapper.xml b/src/main/resources/mapper/GoldbeanGiftMapper.xml
new file mode 100644
index 0000000..bb6ccb2
--- /dev/null
+++ b/src/main/resources/mapper/GoldbeanGiftMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.gb.dao.GoldbeanGiftMapper">
+    <select id = "getGiftList" resultType="com.example.gb.bean.LiveGifts">
+        select id,name from live_gifts
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/GoldbeanPindaoMapper.xml b/src/main/resources/mapper/GoldbeanPindaoMapper.xml
new file mode 100644
index 0000000..7d76c7f
--- /dev/null
+++ b/src/main/resources/mapper/GoldbeanPindaoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.gb.dao.GoldbeanPindaoMapper">
+    <select id = "getPindaoList" resultType="com.example.gb.bean.vo.LivePindaoVO">
+        select id,title from live_pindao
+    </select>
+</mapper>
\ No newline at end of file