频道列表查询和直播礼物列表查询

src/main/java/com/example/gb/bean/fxMember.java → src/main/java/com/example/gb/bean/FxMember.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class fxMember {
+public class FxMember {
     private Integer id;
     private Integer jwCode;
     private String trueName;

src/main/java/com/example/gb/bean/fxYaoqing.java → src/main/java/com/example/gb/bean/FxYaoqing.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class fxYaoqing {
+public class FxYaoqing {
     private Integer id;
     private Integer uid;
     private Integer s1;

src/main/java/com/example/gb/bean/fxYaoqingRecords.java → src/main/java/com/example/gb/bean/FxYaoqingRecords.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class fxYaoqingRecords {
+public class FxYaoqingRecords {
     private Integer id;
     private Integer uid;
     private String content;

src/main/java/com/example/gb/bean/live.java → src/main/java/com/example/gb/bean/Live.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class live {
+public class Live {
     private Integer id;
     private Integer jwCode;
     private Integer type;

src/main/java/com/example/gb/bean/liveGifts.java → src/main/java/com/example/gb/bean/LiveGifts.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class liveGifts {
+public class LiveGifts {
     private Integer id;
     private Integer group;
     private String name;

src/main/java/com/example/gb/bean/PayGOrder.java

@@ -30,4 +30,5 @@ public class PayGOrder {
     private Integer liveId;
     private Boolean isRead;
     private Integer addTime;
+    private String dept;
 }

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;
 }

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;
+}

src/main/java/com/example/gb/controller/GoldPayGOrderController.java

@@ -77,6 +77,14 @@ public class GoldPayGOrderController {
     }
 
     /**
+     * 根据用户部门获取订单
+     */
+    @GetMapping("/dept/{dept}")
+    public List<PayGOrder> getOrdersByDept(@PathVariable String dept) {
+        return goldPayGOrderService.getOrdersByDept(dept);
+    }
+
+    /**
      * 创建新订单
      */
     @PostMapping("/")

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();
+    }
 }

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();
+    }
+}

src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java

@@ -22,6 +22,8 @@ public interface GoldPayGOrderMapper {
 
     List<PayGOrder> findByPage(@Param("offset") int offset, @Param("limit") int limit);
 
+    List<PayGOrder> findByDept(String dept);
+
     int insert(PayGOrder order);
 
     int update(PayGOrder order);

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);
 }

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();
+}

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();
+}

src/main/java/com/example/gb/service/GoldPayGOrderService.java

@@ -13,6 +13,7 @@ public interface GoldPayGOrderService {
     PayGOrder getOrderByPayStyle(Boolean payStyle);
     List<PayGOrder> getOrdersBySuccessTimeRange(Integer startTime, Integer endTime);
     List<PayGOrder> getOrdersByPage(@Param("offset") int offset, @Param("limit") int limit);
+    List<PayGOrder> getOrdersByDept(String dept);
     boolean createOrder(PayGOrder order);
     boolean updateOrder(PayGOrder order);
     boolean deleteOrder(Integer id);

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);
 }

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();
+}

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();
+}

src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java

@@ -34,7 +34,6 @@ public class GoldPayGOrderServiceImpl implements GoldPayGOrderService {
         return goldPayGOrderMapper.findByJwCode(jwCode);
     }
 
-
     @Override
     public PayGOrder getOrderByPayStyle(Boolean payStyle) {
         return goldPayGOrderMapper.findByPayStyle(payStyle);
@@ -51,6 +50,11 @@ public class GoldPayGOrderServiceImpl implements GoldPayGOrderService {
     }
 
     @Override
+    public List<PayGOrder> getOrdersByDept(String dept) {
+        return goldPayGOrderMapper.findByDept(dept);
+    }
+
+    @Override
     public boolean createOrder(PayGOrder order) {
         order.setAddTime((int) (System.currentTimeMillis() / 1000));
         return goldPayGOrderMapper.insert(order) > 0;

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);
     }
 }

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);
+    }
+}

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);
+    }
+}

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;
 }

src/main/resources/mapper/GoldPayGOrderMapper.xml

@@ -58,6 +58,13 @@
         WHERE success_time >= #{startTime} AND success_time <= #{endTime}
     </select>
 
+    <!-- 根据用户部门查询订单 -->
+    <select id="findByDept" parameterType="string" resultMap="BaseResultMap">
+        SELECT o.* FROM pay_xxcg_com_g_order o
+                            JOIN fx_member m ON o.jwcode = m.jwcode
+        WHERE m.dept = #{dept}
+    </select>
+
     <!-- 添加分页查询SQL -->
     <select id="findByPage" resultMap="BaseResultMap">
         SELECT * FROM pay_xxcg_com_g_order

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>

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>

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>