多余代码清理

fs-admin/src/main/java/com/fs/live/controller/LiveGoodsOrderItemsController.java

@@ -1,97 +0,0 @@
-package com.fs.live.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.live.domain.LiveGoodsOrderItems;
-import com.fs.live.service.ILiveGoodsOrderItemsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单商品Controller
- *
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveOrderitems")
-public class LiveGoodsOrderItemsController extends BaseController
-{
-    @Autowired
-    private ILiveGoodsOrderItemsService liveGoodsOrderItemsService;
-
-    /**
-     * 查询订单商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        startPage();
-        List<LiveGoodsOrderItems> list = liveGoodsOrderItemsService.selectLiveGoodsOrderItemsList(liveGoodsOrderItems);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出订单商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:export')")
-    @Log(title = "订单商品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        List<LiveGoodsOrderItems> list = liveGoodsOrderItemsService.selectLiveGoodsOrderItemsList(liveGoodsOrderItems);
-        ExcelUtil<LiveGoodsOrderItems> util = new ExcelUtil<LiveGoodsOrderItems>(LiveGoodsOrderItems.class);
-        return util.exportExcel(list, "订单商品数据");
-    }
-
-    /**
-     * 获取订单商品详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(liveGoodsOrderItemsService.selectLiveGoodsOrderItemsById(id));
-    }
-
-    /**
-     * 新增订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:add')")
-    @Log(title = "订单商品", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        return toAjax(liveGoodsOrderItemsService.insertLiveGoodsOrderItems(liveGoodsOrderItems));
-    }
-
-    /**
-     * 修改订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:edit')")
-    @Log(title = "订单商品", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        return toAjax(liveGoodsOrderItemsService.updateLiveGoodsOrderItems(liveGoodsOrderItems));
-    }
-
-    /**
-     * 删除订单商品
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveOrderitems:remove')")
-    @Log(title = "订单商品", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(liveGoodsOrderItemsService.deleteLiveGoodsOrderItemsByIds(ids));
-    }
-}

fs-admin/src/main/java/com/fs/live/controller/LiveQuestionController.java

@@ -1,97 +0,0 @@
-package com.fs.live.controller.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.live.domain.LiveQuestion;
-import com.fs.live.service.ILiveQuestionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 问答Controller
- *
- * @author fs
- * @date 2025-01-17
- */
-@RestController
-@RequestMapping("/live/liveQuestion")
-public class LiveQuestionController extends BaseController
-{
-    @Autowired
-    private ILiveQuestionService liveQuestionService;
-
-    /**
-     * 查询问答列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(LiveQuestion liveQuestion)
-    {
-        startPage();
-        List<LiveQuestion> list = liveQuestionService.selectLiveQuestionList(liveQuestion);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出问答列表
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:export')")
-    @Log(title = "问答", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(LiveQuestion liveQuestion)
-    {
-        List<LiveQuestion> list = liveQuestionService.selectLiveQuestionList(liveQuestion);
-        ExcelUtil<LiveQuestion> util = new ExcelUtil<LiveQuestion>(LiveQuestion.class);
-        return util.exportExcel(list, "问答数据");
-    }
-
-    /**
-     * 获取问答详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:query')")
-    @GetMapping(value = "/{questionId}")
-    public AjaxResult getInfo(@PathVariable("questionId") Long questionId)
-    {
-        return AjaxResult.success(liveQuestionService.selectLiveQuestionByQuestionId(questionId));
-    }
-
-    /**
-     * 新增问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:add')")
-    @Log(title = "问答", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody LiveQuestion liveQuestion)
-    {
-        return toAjax(liveQuestionService.insertLiveQuestion(liveQuestion));
-    }
-
-    /**
-     * 修改问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:edit')")
-    @Log(title = "问答", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody LiveQuestion liveQuestion)
-    {
-        return toAjax(liveQuestionService.updateLiveQuestion(liveQuestion));
-    }
-
-    /**
-     * 删除问答
-     */
-    @PreAuthorize("@ss.hasPermi('live:liveQuestion:remove')")
-    @Log(title = "问答", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{questionIds}")
-    public AjaxResult remove(@PathVariable Long[] questionIds)
-    {
-        return toAjax(liveQuestionService.deleteLiveQuestionByQuestionIds(questionIds));
-    }
-}

fs-service/src/main/java/com/fs/live/domain/LiveGoodsOrder.java

@@ -1,91 +0,0 @@
-package com.fs.live.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 订单对象 live_goods_order
- *
- * @author fs
- * @date 2025-01-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LiveGoodsOrder extends BaseEntity {
-
-    /** $column.columnComment */
-    @TableId(type = IdType.AUTO)
-    private Long orderId;
-
-    /**
-     * 企业ID
-     */
-    private Long companyId;
-
-    /**
-     * 企业用户ID
-     */
-    private Long companyUserId;
-
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String orderSn;
-
-    /** 用户ID */
-    @Excel(name = "用户ID")
-    private Long userId;
-
-    /** 收货人 */
-    @Excel(name = "收货人")
-    private String userName;
-
-    /** 手机号 */
-    @Excel(name = "手机号")
-    private String mobile;
-
-    /** 地址 */
-    @Excel(name = "地址")
-    private String address;
-
-    /** 支付金额 */
-    @Excel(name = "支付金额")
-    private BigDecimal payMoney;
-
-    /** 订单金额 */
-    @Excel(name = "订单金额")
-    private BigDecimal orderMoney;
-
-    /** 物流编号 */
-    @Excel(name = "物流编号")
-    private String deliveryCode;
-
-    /** 物流名称 */
-    @Excel(name = "物流名称")
-    private String deliveryName;
-
-    /** 物流单号 */
-    @Excel(name = "物流单号")
-    private String deliverySn;
-
-    /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date payTime;
-
-    /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date finishTime;
-
-    /** 状态 1待支付 2已支付 3已发货 4已完成 -1已取消 -2已退款 */
-    @Excel(name = "状态 1待支付 2已支付 3已发货 4已完成 -1已取消 -2已退款")
-    private Integer status;
-}

fs-service/src/main/java/com/fs/live/domain/LiveGoodsOrderItems.java

@@ -1,61 +0,0 @@
-package com.fs.live.domain;
-
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 订单商品对象 live_goods_order_items
- *
- * @author fs
- * @date 2025-01-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LiveGoodsOrderItems extends BaseEntity {
-
-    /** ID */
-
-    private Long id;
-
-    /** 商品ID */
-    @Excel(name = "商品ID")
-    private Long goodsId;
-
-    /** 订单ID */
-    @Excel(name = "订单ID")
-    private Long orderId;
-
-    /**
-     * 企业ID
-     */
-    private Long companyId;
-
-    /**
-     * 企业用户ID
-     */
-    private Long companyUserId;
-
-    /** 商品JSON */
-    @Excel(name = "商品JSON")
-    private String goodsJson;
-
-    /** 商品名 */
-    @Excel(name = "商品名")
-    private String goodsName;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private BigDecimal price;
-
-    /** 数量 */
-    @Excel(name = "数量")
-    private Long num;
-
-    /** 状态 1正常 2已退款 */
-    @Excel(name = "状态 1正常 2已退款")
-    private Integer status;
-}

fs-service/src/main/java/com/fs/live/domain/LiveQuestion.java

@@ -1,53 +0,0 @@
-package com.fs.live.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 问答对象 live_question
- *
- * @author fs
- * @date 2025-01-17
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LiveQuestion extends BaseEntity {
-
-    /** ID */
-    @TableId(type = IdType.AUTO)
-    private Long questionId;
-
-    /**
-     * 企业ID
-     */
-    private Long companyId;
-
-    /**
-     * 企业用户ID
-     */
-    private Long companyUserId;
-
-    /** 用户ID */
-    @Excel(name = "用户ID")
-    private Long userId;
-
-    /** 问题内容 */
-    @Excel(name = "问题内容")
-    private String question;
-
-    /** 回复 */
-    @Excel(name = "回复")
-    private String reply;
-
-    /** 回复时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "回复时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date replyTime;
-}

fs-service/src/main/java/com/fs/live/domain/LiveQuestionBank.java

@@ -1,55 +0,0 @@
-package com.fs.live.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class LiveQuestionBank {
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    /**
-     * 标题
-     */
-    private String title;
-    /**
-     * 内容
-     */
-    private String content;
-    /**
-     * 题目类型 1单选 2多选
-     */
-    private Integer type;
-    /**
-     * 答案
-     */
-    private String answer;
-    /**
-     * sort
-     */
-    private Integer sort;
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-    /**
-     * 修改人
-     */
-    private String updateBy;
-}

fs-service/src/main/java/com/fs/live/domain/LiveQuestionLive.java

@@ -1,39 +0,0 @@
-package com.fs.live.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fs.common.core.domain.BaseEntity;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-
-@Data
-public class LiveQuestionLive {
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-    /**
-     * 直播间ID
-     */
-    private Long liveId;
-    /**
-     * 题目ID
-     */
-    private Long questionId;
-    /**
-     * 序号
-     */
-    private Integer sort;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-    /**
-     * 创建人
-     */
-    private String createBy;
-}

fs-service/src/main/java/com/fs/live/domain/LiveQuestionUserLog.java

@@ -1,57 +0,0 @@
-package com.fs.live.domain;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class LiveQuestionUserLog {
-    /**
-     * 主键ID
-     */
-    private Long id;
-    /**
-     * 直播间ID
-     */
-    private Long liveId;
-    /**
-     * 直播间题库ID
-     */
-    private Long questionLiveId;
-    /**
-     * 用户ID
-     */
-    private Long userId;
-    /**
-     * 标题
-     */
-    private String title;
-    /**
-     * 内容
-     */
-    private String content;
-    /**
-     * 题目类型 1单选 2多选
-     */
-    private Integer type;
-    /**
-     * 答案
-     */
-    private String answer;
-    /**
-     * 回答
-     */
-    private String reply;
-    /**
-     * 是否正确
-     */
-    private Integer correct;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-    /**
-     * 创建人
-     */
-    private String createBy;
-}

fs-service/src/main/java/com/fs/live/domain/LiveStudentData.java

@@ -1,71 +0,0 @@
-package com.fs.live.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 直播间学员数据对象 live_student_data
- *
- * @author fs
- * @date 2025-03-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LiveStudentData extends BaseEntity{
-
-    /** 直播间id */
-    @TableId
-    private Long liveId;
-
-    /** 直播间名称 */
-    @Excel(name = "直播间名称")
-    private String liveName;
-
-    /** 客户id */
-    @Excel(name = "客户id")
-    private Long userId;
-
-    /** 客户名 */
-    @Excel(name = "客户名")
-    private String userName;
-
-    /** 归属部门id */
-    @Excel(name = "归属部门id")
-    private Long deptId;
-
-    /** 客户电话 */
-    @Excel(name = "客户电话")
-    private String userPhone;
-
-    /** 客户创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
-    @Excel(name = "客户创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:ss:mm")
-    private Date userCreateTime;
-
-    /** 分享直播间次数 */
-    @Excel(name = "分享直播间次数")
-    private Long shareCount;
-
-    /** 归属部门名称 */
-    @Excel(name = "归属部门名称")
-    private String deptName;
-
-    /** 跟进人姓名 */
-    @Excel(name = "跟进人姓名")
-    private String companyUserName;
-
-    /** 跟进人id */
-    @Excel(name = "跟进人id")
-    private Long companyUserId;
-
-    private Long goodsCount;
-
-    private Long questionCount;
-
-}

fs-service/src/main/java/com/fs/live/mapper/LiveGoodsOrderItemsMapper.java

@@ -1,73 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveGoodsOrderItems;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 订单商品Mapper接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface LiveGoodsOrderItemsMapper extends BaseMapper<LiveGoodsOrderItems>
-{
-    /**
-     * 查询订单商品
-     *
-     * @param id 订单商品主键
-     * @return 订单商品
-     */
-    public LiveGoodsOrderItems selectLiveGoodsOrderItemsById(Long id);
-
-    /**
-     * 查询企业订单商品
-     * @param id            订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return LiveGoodsOrderItems
-     */
-    LiveGoodsOrderItems selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId(@Param("id") Long id, @Param("companyId") Long companyId, @Param("companyUserId") Long companyUserId);
-
-    /**
-     * 查询订单商品列表
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 订单商品集合
-     */
-    public List<LiveGoodsOrderItems> selectLiveGoodsOrderItemsList(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 新增订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    public int insertLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 修改订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    public int updateLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 删除订单商品
-     *
-     * @param id 订单商品主键
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderItemsById(Long id);
-
-    /**
-     * 批量删除订单商品
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderItemsByIds(Long[] ids);
-}

fs-service/src/main/java/com/fs/live/mapper/LiveGoodsOrderMapper.java

@@ -1,73 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveGoodsOrder;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 订单Mapper接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface LiveGoodsOrderMapper extends BaseMapper<LiveGoodsOrder>
-{
-    /**
-     * 查询订单
-     *
-     * @param orderId 订单主键
-     * @return 订单
-     */
-    public LiveGoodsOrder selectLiveGoodsOrderByOrderId(Long orderId);
-
-    /**
-     * 查询企业订单
-     * @param orderId       订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return LiveGoodsOrder
-     */
-    LiveGoodsOrder selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId(@Param("orderId") Long orderId, @Param("companyId") Long companyId, @Param("companyUserId") Long companyUserId);
-
-    /**
-     * 查询订单列表
-     *
-     * @param liveGoodsOrder 订单
-     * @return 订单集合
-     */
-    public List<LiveGoodsOrder> selectLiveGoodsOrderList(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 新增订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    public int insertLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 修改订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    public int updateLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 删除订单
-     *
-     * @param orderId 订单主键
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderByOrderId(Long orderId);
-
-    /**
-     * 批量删除订单
-     *
-     * @param orderIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderByOrderIds(Long[] orderIds);
-}

fs-service/src/main/java/com/fs/live/mapper/LiveQuestionBankMapper.java

@@ -1,10 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveQuestionBank;
-
-/**
- * 题库mapper
- */
-public interface LiveQuestionBankMapper extends BaseMapper<LiveQuestionBank> {
-}

fs-service/src/main/java/com/fs/live/mapper/LiveQuestionLiveMapper.java

@@ -1,26 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveQuestionLive;
-import com.fs.live.vo.LiveQuestionLiveVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface LiveQuestionLiveMapper extends BaseMapper<LiveQuestionLive> {
-
-    /**
-     * 查询直播间题目列表
-     * @param liveId    直播间ID
-     * @return  list
-     */
-    List<LiveQuestionLiveVO> selectLiveQuestionLiveList(@Param("liveId") Long liveId);
-
-    /**
-     * 查询未被直播间选择的题目列表
-     * @param liveId    直播间ID
-     * @param title     标题
-     * @return  list
-     */
-    List<LiveQuestionLiveVO> selectLiveQuestionOptionList(@Param("liveId") Long liveId, @Param("title") String title);
-}

fs-service/src/main/java/com/fs/live/mapper/LiveQuestionMapper.java

@@ -1,73 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveQuestion;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 问答Mapper接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface LiveQuestionMapper extends BaseMapper<LiveQuestion>
-{
-    /**
-     * 查询问答
-     *
-     * @param questionId 问答主键
-     * @return 问答
-     */
-    public LiveQuestion selectLiveQuestionByQuestionId(Long questionId);
-
-    /**
-     * 查询企业问答
-     * @param questionId        问答ID
-     * @param companyId         企业ID
-     * @param companyUserId     企业用户ID
-     * @return LiveQuestion
-     */
-    LiveQuestion selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId(@Param("questionId") Long questionId, @Param("companyId") Long companyId, @Param("companyUserId") Long companyUserId);
-
-    /**
-     * 查询问答列表
-     *
-     * @param liveQuestion 问答
-     * @return 问答集合
-     */
-    public List<LiveQuestion> selectLiveQuestionList(LiveQuestion liveQuestion);
-
-    /**
-     * 新增问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    public int insertLiveQuestion(LiveQuestion liveQuestion);
-
-    /**
-     * 修改问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    public int updateLiveQuestion(LiveQuestion liveQuestion);
-
-    /**
-     * 删除问答
-     *
-     * @param questionId 问答主键
-     * @return 结果
-     */
-    public int deleteLiveQuestionByQuestionId(Long questionId);
-
-    /**
-     * 批量删除问答
-     *
-     * @param questionIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteLiveQuestionByQuestionIds(Long[] questionIds);
-}

fs-service/src/main/java/com/fs/live/mapper/LiveQuestionUserLogMapper.java

@@ -1,7 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveQuestionUserLog;
-
-public interface LiveQuestionUserLogMapper extends BaseMapper<LiveQuestionUserLog> {
-}

fs-service/src/main/java/com/fs/live/mapper/LiveStudentDataMapper.java

@@ -1,68 +0,0 @@
-package com.fs.live.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fs.live.domain.LiveStudentData;
-import com.fs.live.param.LiveStudentDataQueryParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 直播间学员数据Mapper接口
- *
- * @author fs
- * @date 2025-03-11
- */
-@Repository
-public interface LiveStudentDataMapper extends BaseMapper<LiveStudentData>{
-    /**
-     * 查询直播间学员数据
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 直播间学员数据
-     */
-    LiveStudentData selectLiveStudentDataByLiveId(Long liveId);
-
-    /**
-     * 查询直播间学员数据列表
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 直播间学员数据集合
-     */
-    List<LiveStudentData> selectLiveStudentDataList(LiveStudentData liveStudentData);
-
-    /**
-     * 新增直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    int insertLiveStudentData(LiveStudentData liveStudentData);
-
-    /**
-     * 修改直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    int updateLiveStudentData(LiveStudentData liveStudentData);
-
-    /**
-     * 删除直播间学员数据
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 结果
-     */
-    int deleteLiveStudentDataByLiveId(Long liveId);
-
-    /**
-     * 批量删除直播间学员数据
-     *
-     * @param liveIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteLiveStudentDataByLiveIds(Long[] liveIds);
-
-    List<LiveStudentData> queryStudentData(@Param("param") LiveStudentDataQueryParam param);
-}

fs-service/src/main/java/com/fs/live/param/LiveQuestionLiveQueryParam.java

@@ -1,22 +0,0 @@
-package com.fs.live.param;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-
-@Data
-public class LiveQuestionLiveQueryParam {
-
-    /**
-     * 直播间ID
-     */
-    private Long liveId;
-
-    private Integer pageNum;
-
-    private Integer pageSize;
-}

fs-service/src/main/java/com/fs/live/param/LiveStudentDataQueryParam.java

@@ -1,62 +0,0 @@
-package com.fs.live.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fs.common.annotation.Excel;
-import com.fs.crm.param.BaseQueryParam;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class LiveStudentDataQueryParam extends BaseQueryParam {
-    /** 直播间id数组 */
-    private String[] liveIds;
-    /** 直播间名称 */
-   /* @Excel(name = "直播间名称")
-    private String liveName;*/
-
-    /** 客户名 */
-    @Excel(name = "客户名")
-    private String userName;
-
-    /** 客户电话 */
-    @Excel(name = "客户电话")
-    private String userPhone;
-
-    /** 客户创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "客户创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date userCreateTime;
-
-
-
-    private String startTime;
-
-
-    private String finishTime;
-    /** 分享直播间次数 */
-    @Excel(name = "分享直播间次数")
-    private Long shareCount;
-
-    /** 归属部门名称 */
-    @Excel(name = "归属部门名称")
-    private String deptName;
-
-    /** 归属部门id */
-    @Excel(name = "归属部门id")
-    private String deptId;
-
-    /** 跟进人姓名 */
-    @Excel(name = "跟进人姓名")
-    private String companyUserName;
-
-    /** 购买实物商品 */
-    private Long goodsCount;
-
-    /** 答题次数 */
-    private Long questionCount;
-    //最小提问数
-    private long minQuestionCount;
-    //最大提问数
-    private long maxQuestionCount;
-    }

fs-service/src/main/java/com/fs/live/service/ILiveGoodsOrderItemsService.java

@@ -1,72 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveGoodsOrderItems;
-
-import java.util.List;
-
-/**
- * 订单商品Service接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface ILiveGoodsOrderItemsService extends IService<LiveGoodsOrderItems>
-{
-    /**
-     * 查询订单商品
-     *
-     * @param id 订单商品主键
-     * @return 订单商品
-     */
-    public LiveGoodsOrderItems selectLiveGoodsOrderItemsById(Long id);
-
-    /**
-     * 查询订单商品
-     * @param id            订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return LiveGoodsOrderItems
-     */
-    LiveGoodsOrderItems selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId(Long id, Long companyId, Long companyUserId);
-
-    /**
-     * 查询订单商品列表
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 订单商品集合
-     */
-    public List<LiveGoodsOrderItems> selectLiveGoodsOrderItemsList(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 新增订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    public int insertLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 修改订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    public int updateLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems);
-
-    /**
-     * 批量删除订单商品
-     *
-     * @param ids 需要删除的订单商品主键集合
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderItemsByIds(Long[] ids);
-
-    /**
-     * 删除订单商品信息
-     *
-     * @param id 订单商品主键
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderItemsById(Long id);
-}

fs-service/src/main/java/com/fs/live/service/ILiveGoodsOrderService.java

@@ -1,72 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveGoodsOrder;
-
-import java.util.List;
-
-/**
- * 订单Service接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface ILiveGoodsOrderService extends IService<LiveGoodsOrder>
-{
-    /**
-     * 查询订单
-     *
-     * @param orderId 订单主键
-     * @return 订单
-     */
-    public LiveGoodsOrder selectLiveGoodsOrderByOrderId(Long orderId);
-
-    /**
-     * 查询企业订单
-     * @param orderId       订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return  liveGoodsOrder
-     */
-    LiveGoodsOrder selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId(Long orderId, Long companyId, Long companyUserId);
-
-    /**
-     * 查询订单列表
-     *
-     * @param liveGoodsOrder 订单
-     * @return 订单集合
-     */
-    public List<LiveGoodsOrder> selectLiveGoodsOrderList(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 新增订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    public int insertLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 修改订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    public int updateLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder);
-
-    /**
-     * 批量删除订单
-     *
-     * @param orderIds 需要删除的订单主键集合
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderByOrderIds(Long[] orderIds);
-
-    /**
-     * 删除订单信息
-     *
-     * @param orderId 订单主键
-     * @return 结果
-     */
-    public int deleteLiveGoodsOrderByOrderId(Long orderId);
-}

fs-service/src/main/java/com/fs/live/service/ILiveQuestionBankService.java

@@ -1,40 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveQuestionBank;
-
-import java.util.List;
-
-public interface ILiveQuestionBankService extends IService<LiveQuestionBank> {
-
-    /**
-     * 查询题库列表
-     * @param title 题
-     * @return 题库
-     */
-    List<LiveQuestionBank> selectLiveQuestionBankList(String title);
-
-    /**
-     * 新增题
-     *
-     * @param liveQuestionBank 题
-     * @param username         用户名
-     * @return 受影响行数
-     */
-    int insertLiveQuestionBank(LiveQuestionBank liveQuestionBank, String username);
-
-    /**
-     * 修改题目
-     * @param liveQuestionBank 题目
-     * @param username 用户名
-     * @return  受影响行数
-     */
-    int updateLiveQuestionBank(LiveQuestionBank liveQuestionBank, String username);
-
-    /**
-     * 删除题目
-     * @param ids ID集合
-     * @return 受影响行数
-     */
-    int deleteLiveQuestionBankByIds(Long[] ids);
-}

fs-service/src/main/java/com/fs/live/service/ILiveQuestionLiveService.java

@@ -1,42 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveQuestionLive;
-import com.fs.live.vo.LiveQuestionLiveVO;
-
-import java.util.List;
-
-public interface ILiveQuestionLiveService extends IService<LiveQuestionLive> {
-
-    /**
-     * 查询直播间题目列表
-     * @param liveId    直播间ID
-     * @return  list
-     */
-    List<LiveQuestionLiveVO> selectLiveQuestionLiveList(Long liveId);
-
-    /**
-     * 添加直播间题目
-     * @param liveId    直播间ID
-     * @param questionIds   题目ID集合
-     * @param username  用户名称
-     * @return  是否成功
-     */
-    boolean insertLiveQuestion(Long liveId, List<Long> questionIds, String username);
-
-    /**
-     * 删除直播间题目
-     * @param liveId 直播间ID
-     * @param ids   题目集合
-     * @return 受影响行数
-     */
-    int deleteLiveQuestionByIds(Long liveId, List<Long> ids);
-
-    /**
-     * 查询未被直播间选择的题目列表
-     * @param liveId    直播间ID
-     * @param title     标题
-     * @return  list
-     */
-    List<LiveQuestionLiveVO> selectLiveQuestionOptionList(Long liveId, String title);
-}

fs-service/src/main/java/com/fs/live/service/ILiveQuestionService.java

@@ -1,72 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveQuestion;
-
-import java.util.List;
-
-/**
- * 问答Service接口
- *
- * @author fs
- * @date 2025-01-17
- */
-public interface ILiveQuestionService extends IService<LiveQuestion>
-{
-    /**
-     * 查询问答
-     *
-     * @param questionId 问答主键
-     * @return 问答
-     */
-    public LiveQuestion selectLiveQuestionByQuestionId(Long questionId);
-
-    /**
-     * 查询企业问答
-     * @param questionId       问答ID
-     * @param companyId        企业ID
-     * @param companyUserId    企业用户ID
-     * @return LiveQuestion
-     */
-    LiveQuestion selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId(Long questionId, Long companyId, Long companyUserId);
-
-    /**
-     * 查询问答列表
-     *
-     * @param liveQuestion 问答
-     * @return 问答集合
-     */
-    public List<LiveQuestion> selectLiveQuestionList(LiveQuestion liveQuestion);
-
-    /**
-     * 新增问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    public int insertLiveQuestion(LiveQuestion liveQuestion);
-
-    /**
-     * 修改问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    public int updateLiveQuestion(LiveQuestion liveQuestion);
-
-    /**
-     * 批量删除问答
-     *
-     * @param questionIds 需要删除的问答主键集合
-     * @return 结果
-     */
-    public int deleteLiveQuestionByQuestionIds(Long[] questionIds);
-
-    /**
-     * 删除问答信息
-     *
-     * @param questionId 问答主键
-     * @return 结果
-     */
-    public int deleteLiveQuestionByQuestionId(Long questionId);
-}

fs-service/src/main/java/com/fs/live/service/ILiveQuestionUserLogService.java

@@ -1,7 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveQuestionUserLog;
-
-public interface ILiveQuestionUserLogService extends IService<LiveQuestionUserLog> {
-}

fs-service/src/main/java/com/fs/live/service/ILiveStudentDataService.java

@@ -1,70 +0,0 @@
-package com.fs.live.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.live.domain.LiveStudentData;
-import com.fs.live.param.LiveStudentDataQueryParam;
-
-import java.util.List;
-
-/**
- * 直播间学员数据Service接口
- *
- * @author fs
- * @date 2025-03-11
- */
-public interface ILiveStudentDataService extends IService<LiveStudentData>{
-    /**
-     * 查询直播间学员数据
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 直播间学员数据
-     */
-    LiveStudentData selectLiveStudentDataByLiveId(Long liveId);
-
-    /**
-     * 查询直播间学员数据列表
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 直播间学员数据集合
-     */
-    List<LiveStudentData> selectLiveStudentDataList(LiveStudentData liveStudentData);
-
-    /**
-     * 新增直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    int insertLiveStudentData(LiveStudentData liveStudentData);
-
-    /**
-     * 修改直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    int updateLiveStudentData(LiveStudentData liveStudentData);
-
-    /**
-     * 批量删除直播间学员数据
-     *
-     * @param liveIds 需要删除的直播间学员数据主键集合
-     * @return 结果
-     */
-    int deleteLiveStudentDataByLiveIds(Long[] liveIds);
-
-    /**
-     * 删除直播间学员数据信息
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 结果
-     */
-    int deleteLiveStudentDataByLiveId(Long liveId);
-
-    /**
-     * 查询直播数据统计页直播间学员模块数据
-     * @param param
-     * @return
-     */
-    List<LiveStudentData> queryStudentData(LiveStudentDataQueryParam param);
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsOrderItemsServiceImpl.java

@@ -1,111 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.utils.DateUtils;
-import com.fs.live.domain.LiveGoodsOrderItems;
-import com.fs.live.mapper.LiveGoodsOrderItemsMapper;
-import com.fs.live.service.ILiveGoodsOrderItemsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 订单商品Service业务层处理
- *
- * @author fs
- * @date 2025-01-17
- */
-@Service
-public class LiveGoodsOrderItemsServiceImpl extends ServiceImpl<LiveGoodsOrderItemsMapper, LiveGoodsOrderItems> implements ILiveGoodsOrderItemsService
-{
-    @Autowired
-    private LiveGoodsOrderItemsMapper liveGoodsOrderItemsMapper;
-
-    /**
-     * 查询订单商品
-     *
-     * @param id 订单商品主键
-     * @return 订单商品
-     */
-    @Override
-    public LiveGoodsOrderItems selectLiveGoodsOrderItemsById(Long id)
-    {
-        return liveGoodsOrderItemsMapper.selectLiveGoodsOrderItemsById(id);
-    }
-
-    /**
-     * 查询企业订单商品
-     * @param id            订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return LiveGoodsOrderItems
-     */
-    @Override
-    public LiveGoodsOrderItems selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId(Long id, Long companyId, Long companyUserId)
-    {
-        return liveGoodsOrderItemsMapper.selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId(id, companyId, companyUserId);
-    }
-
-    /**
-     * 查询订单商品列表
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 订单商品
-     */
-    @Override
-    public List<LiveGoodsOrderItems> selectLiveGoodsOrderItemsList(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        return liveGoodsOrderItemsMapper.selectLiveGoodsOrderItemsList(liveGoodsOrderItems);
-    }
-
-    /**
-     * 新增订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    @Override
-    public int insertLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        liveGoodsOrderItems.setCreateTime(DateUtils.getNowDate());
-        return liveGoodsOrderItemsMapper.insertLiveGoodsOrderItems(liveGoodsOrderItems);
-    }
-
-    /**
-     * 修改订单商品
-     *
-     * @param liveGoodsOrderItems 订单商品
-     * @return 结果
-     */
-    @Override
-    public int updateLiveGoodsOrderItems(LiveGoodsOrderItems liveGoodsOrderItems)
-    {
-        liveGoodsOrderItems.setUpdateTime(DateUtils.getNowDate());
-        return liveGoodsOrderItemsMapper.updateLiveGoodsOrderItems(liveGoodsOrderItems);
-    }
-
-    /**
-     * 批量删除订单商品
-     *
-     * @param ids 需要删除的订单商品主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveGoodsOrderItemsByIds(Long[] ids)
-    {
-        return liveGoodsOrderItemsMapper.deleteLiveGoodsOrderItemsByIds(ids);
-    }
-
-    /**
-     * 删除订单商品信息
-     *
-     * @param id 订单商品主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveGoodsOrderItemsById(Long id)
-    {
-        return liveGoodsOrderItemsMapper.deleteLiveGoodsOrderItemsById(id);
-    }
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsOrderServiceImpl.java

@@ -1,110 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.utils.DateUtils;
-import com.fs.live.domain.LiveGoodsOrder;
-import com.fs.live.mapper.LiveGoodsOrderMapper;
-import com.fs.live.service.ILiveGoodsOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 订单Service业务层处理
- *
- * @author fs
- * @date 2025-01-17
- */
-@Service
-public class LiveGoodsOrderServiceImpl extends ServiceImpl<LiveGoodsOrderMapper, LiveGoodsOrder> implements ILiveGoodsOrderService
-{
-    @Autowired
-    private LiveGoodsOrderMapper liveGoodsOrderMapper;
-
-    /**
-     * 查询订单
-     *
-     * @param orderId 订单主键
-     * @return 订单
-     */
-    @Override
-    public LiveGoodsOrder selectLiveGoodsOrderByOrderId(Long orderId)
-    {
-        return liveGoodsOrderMapper.selectLiveGoodsOrderByOrderId(orderId);
-    }
-
-    /**
-     * 查询企业订单
-     * @param orderId       订单ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return LiveGoodsOrder
-     */
-    @Override
-    public LiveGoodsOrder selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId(Long orderId, Long companyId, Long companyUserId) {
-        return liveGoodsOrderMapper.selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId(orderId, companyId, companyUserId);
-    }
-
-    /**
-     * 查询订单列表
-     *
-     * @param liveGoodsOrder 订单
-     * @return 订单
-     */
-    @Override
-    public List<LiveGoodsOrder> selectLiveGoodsOrderList(LiveGoodsOrder liveGoodsOrder)
-    {
-        return liveGoodsOrderMapper.selectLiveGoodsOrderList(liveGoodsOrder);
-    }
-
-    /**
-     * 新增订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    @Override
-    public int insertLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder)
-    {
-        liveGoodsOrder.setCreateTime(DateUtils.getNowDate());
-        return liveGoodsOrderMapper.insertLiveGoodsOrder(liveGoodsOrder);
-    }
-
-    /**
-     * 修改订单
-     *
-     * @param liveGoodsOrder 订单
-     * @return 结果
-     */
-    @Override
-    public int updateLiveGoodsOrder(LiveGoodsOrder liveGoodsOrder)
-    {
-        liveGoodsOrder.setUpdateTime(DateUtils.getNowDate());
-        return liveGoodsOrderMapper.updateLiveGoodsOrder(liveGoodsOrder);
-    }
-
-    /**
-     * 批量删除订单
-     *
-     * @param orderIds 需要删除的订单主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveGoodsOrderByOrderIds(Long[] orderIds)
-    {
-        return liveGoodsOrderMapper.deleteLiveGoodsOrderByOrderIds(orderIds);
-    }
-
-    /**
-     * 删除订单信息
-     *
-     * @param orderId 订单主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveGoodsOrderByOrderId(Long orderId)
-    {
-        return liveGoodsOrderMapper.deleteLiveGoodsOrderByOrderId(orderId);
-    }
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveQuestionBankServiceImpl.java

@@ -1,124 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.exception.ServiceException;
-import com.fs.common.exception.base.BaseException;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.bean.BeanUtils;
-import com.fs.live.domain.LiveQuestionBank;
-import com.fs.live.domain.LiveQuestionLive;
-import com.fs.live.mapper.LiveQuestionBankMapper;
-import com.fs.live.mapper.LiveQuestionLiveMapper;
-import com.fs.live.service.ILiveQuestionBankService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@Service
-@AllArgsConstructor
-public class LiveQuestionBankServiceImpl extends ServiceImpl<LiveQuestionBankMapper, LiveQuestionBank> implements ILiveQuestionBankService {
-
-    private final LiveQuestionLiveMapper liveQuestionLiveMapper;
-
-    /**
-     * 查询题库列表
-     * @param title 题
-     * @return 题库
-     */
-    @Override
-    public List<LiveQuestionBank> selectLiveQuestionBankList(String title) {
-        LambdaQueryWrapper<LiveQuestionBank> wrapper = new LambdaQueryWrapper<>();
-
-        if (StringUtils.isNotBlank(title)) {
-            wrapper.like(LiveQuestionBank::getTitle, title);
-        }
-
-        return baseMapper.selectList(wrapper);
-    }
-
-    /**
-     * 新增题
-     *
-     * @param liveQuestionBank 题
-     * @param username  用户名称
-     * @return 受影响行数
-     */
-    @Override
-    public int insertLiveQuestionBank(LiveQuestionBank liveQuestionBank, String username) {
-        // 参数校验
-        verifyParams(liveQuestionBank);
-
-        liveQuestionBank.setCreateTime(LocalDateTime.now());
-        liveQuestionBank.setCreateBy(username);
-        liveQuestionBank.setUpdateTime(LocalDateTime.now());
-        liveQuestionBank.setUpdateBy(username);
-        return baseMapper.insert(liveQuestionBank);
-    }
-
-    /**
-     * 参数校验
-     * @param liveQuestionBank 题目
-     */
-    private void verifyParams(LiveQuestionBank liveQuestionBank) {
-        if (StringUtils.isBlank(liveQuestionBank.getTitle())) {
-            throw new BaseException("题干不能为空");
-        }
-        if (StringUtils.isBlank(liveQuestionBank.getContent())) {
-            throw new BaseException("内容不能为空");
-        }
-        if (Objects.isNull(liveQuestionBank.getType())) {
-            throw new BaseException("类型不能为空");
-        }
-        if (StringUtils.isBlank(liveQuestionBank.getAnswer())) {
-            throw new BaseException("答案不能为空");
-        }
-    }
-
-    /**
-     * 修改题目
-     * @param liveQuestionBank 题目
-     * @param username 用户名
-     * @return  受影响行数
-     */
-    @Override
-    public int updateLiveQuestionBank(LiveQuestionBank liveQuestionBank, String username) {
-        // 参数校验
-        verifyParams(liveQuestionBank);
-
-        if (Objects.isNull(liveQuestionBank.getId())) {
-            throw new BaseException("ID不能为空");
-        }
-
-        LiveQuestionBank questionBank = baseMapper.selectById(liveQuestionBank.getId());
-        if (Objects.isNull(questionBank)) {
-            throw new BaseException("题目不存在");
-        }
-
-        BeanUtils.copyProperties(liveQuestionBank, questionBank);
-        liveQuestionBank.setUpdateTime(LocalDateTime.now());
-        liveQuestionBank.setUpdateBy(username);
-        return baseMapper.updateById(liveQuestionBank);
-    }
-
-    /**
-     * 删除题目
-     * @param ids ID集合
-     * @return 受影响行数
-     */
-    @Override
-    public int deleteLiveQuestionBankByIds(Long[] ids) {
-        // 判断是否被使用
-        Wrapper<LiveQuestionLive> wrapper = new LambdaQueryWrapper<LiveQuestionLive>().in(LiveQuestionLive::getQuestionId, Arrays.asList(ids));
-        if (liveQuestionLiveMapper.selectCount(wrapper) > 0) {
-            throw new ServiceException("题目使用中,无法删除");
-        }
-
-        return baseMapper.deleteBatchIds(Arrays.asList(ids));
-    }
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveQuestionLiveServiceImpl.java

@@ -1,117 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.exception.ServiceException;
-import com.fs.live.domain.Live;
-import com.fs.live.domain.LiveQuestionBank;
-import com.fs.live.domain.LiveQuestionLive;
-import com.fs.live.mapper.LiveMapper;
-import com.fs.live.mapper.LiveQuestionBankMapper;
-import com.fs.live.mapper.LiveQuestionLiveMapper;
-import com.fs.live.service.ILiveQuestionLiveService;
-import com.fs.live.vo.LiveQuestionLiveVO;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@Service
-@AllArgsConstructor
-public class LiveQuestionLiveServiceImpl extends ServiceImpl<LiveQuestionLiveMapper, LiveQuestionLive> implements ILiveQuestionLiveService {
-
-    private final LiveQuestionBankMapper liveQuestionBankMapper;
-    private final LiveMapper liveMapper;
-
-    /**
-     * 查询直播间题目列表
-     * @param liveId    直播间ID
-     * @return  list
-     */
-    @Override
-    public List<LiveQuestionLiveVO> selectLiveQuestionLiveList(Long liveId) {
-        return baseMapper.selectLiveQuestionLiveList(liveId);
-    }
-
-    /**
-     * 添加直播间题目
-     * @param liveId    直播间ID
-     * @param questionIds   题目ID集合
-     * @param username  用户名称
-     * @return  是否成功
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public boolean insertLiveQuestion(Long liveId, List<Long> questionIds, String username) {
-        Live live = liveMapper.selectById(liveId);
-        if (Objects.isNull(live)) {
-            throw new ServiceException("直播间不存在");
-        }
-
-        Collection<LiveQuestionBank> liveQuestionBanks = liveQuestionBankMapper.selectBatchIds(questionIds);
-        if (liveQuestionBanks.isEmpty()) {
-            throw new ServiceException("请选择有效的题目");
-        }
-
-        Set<Long> ids = liveQuestionBanks.stream().map(LiveQuestionBank::getId).collect(Collectors.toSet());
-
-        // 过滤已经存在的题目
-        Wrapper<LiveQuestionLive> wrapper = Wrappers.<LiveQuestionLive>lambdaQuery()
-                .eq(LiveQuestionLive::getLiveId, liveId)
-                .in(LiveQuestionLive::getQuestionId, ids);
-        Set<Long> hasQuestions = baseMapper.selectList(wrapper).stream().map(LiveQuestionLive::getQuestionId).collect(Collectors.toSet());
-
-        List<LiveQuestionLive> liveQuestionLives = ids.stream().filter(id -> !hasQuestions.contains(id))
-        .map(id -> {
-            LiveQuestionLive liveQuestionLive = new LiveQuestionLive();
-            liveQuestionLive.setLiveId(liveId);
-            liveQuestionLive.setQuestionId(id);
-            liveQuestionLive.setCreateTime(LocalDateTime.now());
-            liveQuestionLive.setCreateBy(username);
-            return liveQuestionLive;
-        }).collect(Collectors.toList());
-
-        if (!liveQuestionLives.isEmpty()) {
-            return saveBatch(liveQuestionLives);
-        }
-
-        return false;
-    }
-
-    /**
-     * 删除直播间题目
-     * @param liveId 直播间ID
-     * @param ids   题目集合
-     * @return 受影响行数
-     */
-    @Override
-    public int deleteLiveQuestionByIds(Long liveId, List<Long> ids) {
-        Live live = liveMapper.selectById(liveId);
-        if (Objects.isNull(live)) {
-            throw new ServiceException("直播间不存在");
-        }
-
-        // TODO:判断是否被使用
-
-        Wrapper<LiveQuestionLive> wrapper = Wrappers.<LiveQuestionLive>lambdaQuery().eq(LiveQuestionLive::getLiveId, liveId).in(LiveQuestionLive::getId, ids);
-        return baseMapper.delete(wrapper);
-    }
-
-    /**
-     * 查询未被直播间选择的题目列表
-     * @param liveId    直播间ID
-     * @param title     标题
-     * @return  list
-     */
-    @Override
-    public List<LiveQuestionLiveVO> selectLiveQuestionOptionList(Long liveId, String title) {
-        return baseMapper.selectLiveQuestionOptionList(liveId, title);
-    }
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveQuestionServiceImpl.java

@@ -1,111 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.utils.DateUtils;
-import com.fs.live.domain.LiveQuestion;
-import com.fs.live.mapper.LiveQuestionMapper;
-import com.fs.live.service.ILiveQuestionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 问答Service业务层处理
- *
- * @author fs
- * @date 2025-01-17
- */
-@Service
-public class LiveQuestionServiceImpl extends ServiceImpl<LiveQuestionMapper, LiveQuestion> implements ILiveQuestionService
-{
-    @Autowired
-    private LiveQuestionMapper liveQuestionMapper;
-
-    /**
-     * 查询问答
-     *
-     * @param questionId 问答主键
-     * @return 问答
-     */
-    @Override
-    public LiveQuestion selectLiveQuestionByQuestionId(Long questionId)
-    {
-        return liveQuestionMapper.selectLiveQuestionByQuestionId(questionId);
-    }
-
-    /**
-     * 查询企业问答
-     * @param questionId       问答ID
-     * @param companyId        企业ID
-     * @param companyUserId    企业用户ID
-     * @return LiveQuestion
-     */
-    @Override
-    public LiveQuestion selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId(Long questionId, Long companyId, Long companyUserId)
-    {
-        return liveQuestionMapper.selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId(questionId, companyId, companyUserId);
-    }
-
-    /**
-     * 查询问答列表
-     *
-     * @param liveQuestion 问答
-     * @return 问答
-     */
-    @Override
-    public List<LiveQuestion> selectLiveQuestionList(LiveQuestion liveQuestion)
-    {
-        return liveQuestionMapper.selectLiveQuestionList(liveQuestion);
-    }
-
-    /**
-     * 新增问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    @Override
-    public int insertLiveQuestion(LiveQuestion liveQuestion)
-    {
-        liveQuestion.setCreateTime(DateUtils.getNowDate());
-        return liveQuestionMapper.insertLiveQuestion(liveQuestion);
-    }
-
-    /**
-     * 修改问答
-     *
-     * @param liveQuestion 问答
-     * @return 结果
-     */
-    @Override
-    public int updateLiveQuestion(LiveQuestion liveQuestion)
-    {
-        liveQuestion.setUpdateTime(DateUtils.getNowDate());
-        return liveQuestionMapper.updateLiveQuestion(liveQuestion);
-    }
-
-    /**
-     * 批量删除问答
-     *
-     * @param questionIds 需要删除的问答主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveQuestionByQuestionIds(Long[] questionIds)
-    {
-        return liveQuestionMapper.deleteLiveQuestionByQuestionIds(questionIds);
-    }
-
-    /**
-     * 删除问答信息
-     *
-     * @param questionId 问答主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveQuestionByQuestionId(Long questionId)
-    {
-        return liveQuestionMapper.deleteLiveQuestionByQuestionId(questionId);
-    }
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveQuestionUserLogServiceImpl.java

@@ -1,11 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.live.domain.LiveQuestionUserLog;
-import com.fs.live.mapper.LiveQuestionUserLogMapper;
-import com.fs.live.service.ILiveQuestionUserLogService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class LiveQuestionUserLogServiceImpl extends ServiceImpl<LiveQuestionUserLogMapper,LiveQuestionUserLog> implements ILiveQuestionUserLogService {
-}

fs-service/src/main/java/com/fs/live/service/impl/LiveStudentDataServiceImpl.java

@@ -1,100 +0,0 @@
-package com.fs.live.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.live.domain.LiveStudentData;
-import com.fs.live.mapper.LiveStudentDataMapper;
-import com.fs.live.param.LiveStudentDataQueryParam;
-import com.fs.live.service.ILiveStudentDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 直播间学员数据Service业务层处理
- *
- * @author fs
- * @date 2025-03-11
- */
-@Service
-public class LiveStudentDataServiceImpl extends ServiceImpl<LiveStudentDataMapper, LiveStudentData> implements ILiveStudentDataService {
-    @Autowired
-    private LiveStudentDataMapper liveStudentDataMapper;
-    /**
-     * 查询直播间学员数据
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 直播间学员数据
-     */
-    @Override
-    public LiveStudentData selectLiveStudentDataByLiveId(Long liveId)
-    {
-        return baseMapper.selectLiveStudentDataByLiveId(liveId);
-    }
-
-    /**
-     * 查询直播间学员数据列表
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 直播间学员数据
-     */
-    @Override
-    public List<LiveStudentData> selectLiveStudentDataList(LiveStudentData liveStudentData)
-    {
-        return baseMapper.selectLiveStudentDataList(liveStudentData);
-    }
-
-    /**
-     * 新增直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    @Override
-    public int insertLiveStudentData(LiveStudentData liveStudentData)
-    {
-        return baseMapper.insertLiveStudentData(liveStudentData);
-    }
-
-    /**
-     * 修改直播间学员数据
-     *
-     * @param liveStudentData 直播间学员数据
-     * @return 结果
-     */
-    @Override
-    public int updateLiveStudentData(LiveStudentData liveStudentData)
-    {
-        return baseMapper.updateLiveStudentData(liveStudentData);
-    }
-
-    /**
-     * 批量删除直播间学员数据
-     *
-     * @param liveIds 需要删除的直播间学员数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveStudentDataByLiveIds(Long[] liveIds)
-    {
-        return baseMapper.deleteLiveStudentDataByLiveIds(liveIds);
-    }
-
-    /**
-     * 删除直播间学员数据信息
-     *
-     * @param liveId 直播间学员数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLiveStudentDataByLiveId(Long liveId)
-    {
-        return baseMapper.deleteLiveStudentDataByLiveId(liveId);
-    }
-
-    @Override
-    public List<LiveStudentData> queryStudentData( LiveStudentDataQueryParam param) {
-
-        return liveStudentDataMapper.queryStudentData(param);
-    }
-}

fs-service/src/main/resources/mapper/live/LiveGoodsOrderItemsMapper.xml

@@ -1,119 +0,0 @@
-<?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.fs.live.mapper.LiveGoodsOrderItemsMapper">
-    
-    <resultMap type="LiveGoodsOrderItems" id="LiveGoodsOrderItemsResult">
-        <result property="id"    column="id"    />
-        <result property="goodsId"    column="goods_id"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-        <result property="goodsJson"    column="goods_json"    />
-        <result property="goodsName"    column="goods_name"    />
-        <result property="price"    column="price"    />
-        <result property="num"    column="num"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectLiveGoodsOrderItemsVo">
-        select id, goods_id, order_id, company_id, company_user_id, goods_json, goods_name, price, num, status, create_time, create_by, update_by, update_time, remark from live_goods_order_items
-    </sql>
-
-    <select id="selectLiveGoodsOrderItemsList" parameterType="LiveGoodsOrderItems" resultMap="LiveGoodsOrderItemsResult">
-        <include refid="selectLiveGoodsOrderItemsVo"/>
-        <where>  
-            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-            <if test="goodsJson != null  and goodsJson != ''"> and goods_json = #{goodsJson}</if>
-            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="num != null "> and num = #{num}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectLiveGoodsOrderItemsById" parameterType="Long" resultMap="LiveGoodsOrderItemsResult">
-        <include refid="selectLiveGoodsOrderItemsVo"/>
-        where id = #{id}
-    </select>
-
-    <select id="selectLiveGoodsOrderItemsByIdAndCompanyIdAndCompanyUserId" resultMap="LiveGoodsOrderItemsResult">
-        <include refid="selectLiveGoodsOrderItemsVo"/>
-        where id = #{id} and company_id = #{companyId} and company_user_id = #{companyUserId}
-    </select>
-
-    <insert id="insertLiveGoodsOrderItems" parameterType="LiveGoodsOrderItems" useGeneratedKeys="true" keyProperty="id">
-        insert into live_goods_order_items
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="goodsId != null">goods_id,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-            <if test="goodsJson != null">goods_json,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="price != null">price,</if>
-            <if test="num != null">num,</if>
-            <if test="status != null">status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="goodsId != null">#{goodsId},</if>
-            <if test="orderId != null">#{orderId},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="goodsJson != null">#{goodsJson},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="price != null">#{price},</if>
-            <if test="num != null">#{num},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLiveGoodsOrderItems" parameterType="LiveGoodsOrderItems">
-        update live_goods_order_items
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="goodsId != null">goods_id = #{goodsId},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="goodsJson != null">goods_json = #{goodsJson},</if>
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="num != null">num = #{num},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteLiveGoodsOrderItemsById" parameterType="Long">
-        delete from live_goods_order_items where id = #{id}
-    </delete>
-
-    <delete id="deleteLiveGoodsOrderItemsByIds" parameterType="String">
-        delete from live_goods_order_items where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

fs-service/src/main/resources/mapper/live/LiveGoodsOrderMapper.xml

@@ -1,151 +0,0 @@
-<?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.fs.live.mapper.LiveGoodsOrderMapper">
-    
-    <resultMap type="LiveGoodsOrder" id="LiveGoodsOrderResult">
-        <result property="orderId"    column="order_id"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-        <result property="orderSn"    column="order_sn"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="address"    column="address"    />
-        <result property="payMoney"    column="pay_money"    />
-        <result property="orderMoney"    column="order_money"    />
-        <result property="deliveryCode"    column="delivery_code"    />
-        <result property="deliveryName"    column="delivery_name"    />
-        <result property="deliverySn"    column="delivery_sn"    />
-        <result property="payTime"    column="pay_time"    />
-        <result property="finishTime"    column="finish_time"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectLiveGoodsOrderVo">
-        select order_id, company_id, company_user_id, order_sn, user_id, user_name, mobile, address, pay_money, order_money, delivery_code, delivery_name, delivery_sn, pay_time, finish_time, status, create_time, create_by, update_by, update_time, remark from live_goods_order
-    </sql>
-
-    <select id="selectLiveGoodsOrderList" parameterType="LiveGoodsOrder" resultMap="LiveGoodsOrderResult">
-        <include refid="selectLiveGoodsOrderVo"/>
-        <where>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-            <if test="orderSn != null  and orderSn != ''"> and order_sn = #{orderSn}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="payMoney != null "> and pay_money = #{payMoney}</if>
-            <if test="orderMoney != null "> and order_money = #{orderMoney}</if>
-            <if test="deliveryCode != null  and deliveryCode != ''"> and delivery_code = #{deliveryCode}</if>
-            <if test="deliveryName != null  and deliveryName != ''"> and delivery_name like concat('%', #{deliveryName}, '%')</if>
-            <if test="deliverySn != null  and deliverySn != ''"> and delivery_sn = #{deliverySn}</if>
-            <if test="payTime != null "> and pay_time = #{payTime}</if>
-            <if test="finishTime != null "> and finish_time = #{finishTime}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectLiveGoodsOrderByOrderId" parameterType="Long" resultMap="LiveGoodsOrderResult">
-        <include refid="selectLiveGoodsOrderVo"/>
-        where order_id = #{orderId}
-    </select>
-
-    <select id="selectLiveGoodsOrderByOrderIdAndCompanyIdAndCompanyUserId" resultMap="LiveGoodsOrderResult">
-        <include refid="selectLiveGoodsOrderVo"/>
-        where order_id = #{orderId} and company_id = #{companyId} and company_user_id = #{companyUserId}
-    </select>
-
-    <insert id="insertLiveGoodsOrder" parameterType="LiveGoodsOrder">
-        insert into live_goods_order
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">order_id,</if>
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-            <if test="orderSn != null">order_sn,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="mobile != null">mobile,</if>
-            <if test="address != null">address,</if>
-            <if test="payMoney != null">pay_money,</if>
-            <if test="orderMoney != null">order_money,</if>
-            <if test="deliveryCode != null">delivery_code,</if>
-            <if test="deliveryName != null">delivery_name,</if>
-            <if test="deliverySn != null">delivery_sn,</if>
-            <if test="payTime != null">pay_time,</if>
-            <if test="finishTime != null">finish_time,</if>
-            <if test="status != null">status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="orderId != null">#{orderId},</if>
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="orderSn != null">#{orderSn},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="mobile != null">#{mobile},</if>
-            <if test="address != null">#{address},</if>
-            <if test="payMoney != null">#{payMoney},</if>
-            <if test="orderMoney != null">#{orderMoney},</if>
-            <if test="deliveryCode != null">#{deliveryCode},</if>
-            <if test="deliveryName != null">#{deliveryName},</if>
-            <if test="deliverySn != null">#{deliverySn},</if>
-            <if test="payTime != null">#{payTime},</if>
-            <if test="finishTime != null">#{finishTime},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLiveGoodsOrder" parameterType="LiveGoodsOrder">
-        update live_goods_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderSn != null">order_sn = #{orderSn},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="mobile != null">mobile = #{mobile},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="payMoney != null">pay_money = #{payMoney},</if>
-            <if test="orderMoney != null">order_money = #{orderMoney},</if>
-            <if test="deliveryCode != null">delivery_code = #{deliveryCode},</if>
-            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
-            <if test="deliverySn != null">delivery_sn = #{deliverySn},</if>
-            <if test="payTime != null">pay_time = #{payTime},</if>
-            <if test="finishTime != null">finish_time = #{finishTime},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where order_id = #{orderId}
-    </update>
-
-    <delete id="deleteLiveGoodsOrderByOrderId" parameterType="Long">
-        delete from live_goods_order where order_id = #{orderId}
-    </delete>
-
-    <delete id="deleteLiveGoodsOrderByOrderIds" parameterType="String">
-        delete from live_goods_order where order_id in 
-        <foreach item="orderId" collection="array" open="(" separator="," close=")">
-            #{orderId}
-        </foreach>
-    </delete>
-</mapper>

fs-service/src/main/resources/mapper/live/LiveQuestionBankMapper.xml

@@ -1,7 +0,0 @@
-<?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.fs.live.mapper.LiveQuestionBankMapper">
-
-</mapper>

fs-service/src/main/resources/mapper/live/LiveQuestionLiveMapper.xml

@@ -1,35 +0,0 @@
-<?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.fs.live.mapper.LiveQuestionLiveMapper">
-
-    <select id="selectLiveQuestionLiveList" resultType="com.fs.live.vo.LiveQuestionLiveVO">
-        select
-            ql.id,
-            qb.title,
-            qb.type,
-            ql.sort,
-            ql.create_time,
-            ql.create_by
-        from live_question_live ql
-        left join live_question_bank qb on ql.question_id = qb.id
-        where ql.live_id = #{liveId}
-    </select>
-
-    <select id="selectLiveQuestionOptionList" resultType="com.fs.live.vo.LiveQuestionLiveVO">
-        select
-            qb.id,
-            qb.title,
-            qb.type,
-            qb.sort,
-            qb.create_time,
-            qb.create_by
-        from live_question_bank qb
-        left join live_question_live ql on ql.question_id = qb.id and ql.live_id = #{liveId}
-        where ql.question_id is null
-        <if test="title != null and title != ''">
-            and qb.title like concat('%', #{title}, '%')
-        </if>
-    </select>
-</mapper>

fs-service/src/main/resources/mapper/live/LiveQuestionMapper.xml

@@ -1,104 +0,0 @@
-<?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.fs.live.mapper.LiveQuestionMapper">
-    
-    <resultMap type="LiveQuestion" id="LiveQuestionResult">
-        <result property="questionId"    column="question_id"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="companyUserId"    column="company_user_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="question"    column="question"    />
-        <result property="reply"    column="reply"    />
-        <result property="replyTime"    column="reply_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-    </resultMap>
-
-    <sql id="selectLiveQuestionVo">
-        select question_id, company_id, company_user_id, user_id, question, reply, reply_time, create_time, create_by, update_by, update_time, remark from live_question
-    </sql>
-
-    <select id="selectLiveQuestionList" parameterType="LiveQuestion" resultMap="LiveQuestionResult">
-        <include refid="selectLiveQuestionVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-            <if test="question != null  and question != ''"> and question = #{question}</if>
-            <if test="reply != null  and reply != ''"> and reply = #{reply}</if>
-            <if test="replyTime != null "> and reply_time = #{replyTime}</if>
-        </where>
-    </select>
-    
-    <select id="selectLiveQuestionByQuestionId" parameterType="Long" resultMap="LiveQuestionResult">
-        <include refid="selectLiveQuestionVo"/>
-        where question_id = #{questionId}
-    </select>
-
-    <select id="selectLiveQuestionByQuestionIdAndCompanyIdAndCompanyUserId" resultMap="LiveQuestionResult">
-        <include refid="selectLiveQuestionVo"/>
-        where question_id = #{questionId} and company_id = #{companyId} and company_user_id = #{companyUserId}
-    </select>
-
-    <insert id="insertLiveQuestion" parameterType="LiveQuestion" useGeneratedKeys="true" keyProperty="questionId">
-        insert into live_question
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">company_id,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="question != null">question,</if>
-            <if test="reply != null">reply,</if>
-            <if test="replyTime != null">reply_time,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">#{companyId},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="question != null">#{question},</if>
-            <if test="reply != null">#{reply},</if>
-            <if test="replyTime != null">#{replyTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLiveQuestion" parameterType="LiveQuestion">
-        update live_question
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="question != null">question = #{question},</if>
-            <if test="reply != null">reply = #{reply},</if>
-            <if test="replyTime != null">reply_time = #{replyTime},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where question_id = #{questionId}
-    </update>
-
-    <delete id="deleteLiveQuestionByQuestionId" parameterType="Long">
-        delete from live_question where question_id = #{questionId}
-    </delete>
-
-    <delete id="deleteLiveQuestionByQuestionIds" parameterType="String">
-        delete from live_question where question_id in 
-        <foreach item="questionId" collection="array" open="(" separator="," close=")">
-            #{questionId}
-        </foreach>
-    </delete>
-</mapper>

fs-service/src/main/resources/mapper/live/LiveQuestionUserLogMapper.xml

@@ -1,7 +0,0 @@
-<?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.fs.live.mapper.LiveQuestionUserLogMapper">
-
-</mapper>

fs-service/src/main/resources/mapper/live/LiveStudentDataMapper.xml

@@ -1,152 +0,0 @@
-<?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.fs.live.mapper.LiveStudentDataMapper">
-    
-    <resultMap type="LiveStudentData" id="LiveStudentDataResult">
-        <result property="liveId"    column="live_id"    />
-        <result property="liveName"    column="live_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="userPhone"    column="user_phone"    />
-        <result property="userCreateTime"    column="user_create_time"    />
-        <result property="shareCount"    column="share_count"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="companyUserName"    column="company_user_name"    />
-        <result property="companyUserId"    column="company_user_id"    />
-    </resultMap>
-
-    <sql id="selectLiveStudentDataVo">
-        select live_id, live_name, user_id, user_name, dept_id, user_phone, user_create_time, share_count, dept_name, company_user_name, company_user_id from live_student_data
-    </sql>
-
-    <select id="selectLiveStudentDataList" parameterType="LiveStudentData" resultMap="LiveStudentDataResult">
-        <include refid="selectLiveStudentDataVo"/>
-        <where>  
-            <if test="liveName != null  and liveName != ''"> and live_name like concat('%', #{liveName}, '%')</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
-            <if test="userCreateTime != null "> and user_create_time = #{userCreateTime}</if>
-            <if test="shareCount != null "> and share_count = #{shareCount}</if>
-            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="compayUserName != null  and compayUserName != ''"> and company_user_name like concat('%', #{compayUserName}, '%')</if>
-            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-        </where>
-    </select>
-    
-    <select id="selectLiveStudentDataByLiveId" parameterType="Long" resultMap="LiveStudentDataResult">
-        <include refid="selectLiveStudentDataVo"/>
-        where live_id = #{liveId}
-    </select>
-    <select id="queryStudentData" resultType="com.fs.live.domain.LiveStudentData">
-        SELECT
-        A.user_name AS userName,
-        A.user_phone AS userPhone,
-        A.dept_name AS deptName,
-        A.live_name AS liveName,
-        A.company_user_name AS companyUserName,
-        A.share_count AS shareCount,
-        A.user_create_time AS userCreateTime,
-        COUNT(C.user_id) AS questionCount,
-        COUNT(B.user_id) AS goodsCount
-        FROM live_student_data A
-        LEFT JOIN live_goods_order B ON A.user_id = B.user_id
-        LEFT JOIN live_question C ON A.user_id = C.user_id
-        WHERE 1=1
-        <if test="param.liveIds != null and param.liveIds.length > 0">
-            AND A.live_id IN
-            <foreach collection="param.liveIds" item="id" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        <if test="param.userName != null and param.userName != ''">
-            AND A.user_name LIKE CONCAT('%', #{param.userName}, '%')
-        </if>
-        <if test="param.userPhone != null and param.userPhone != ''">
-            AND A.user_phone LIKE CONCAT('%', #{param.userPhone}, '%')
-        </if>
-        <if test="param.deptId != null and param.deptId != ''">
-            AND A.dept_id = #{param.deptId}
-        </if>
-        <if test="param.companyUserName != null and param.companyUserName != ''">
-            AND A.company_user_name LIKE CONCAT('%', #{param.companyUserName}, '%')
-        </if>
-        <if test="param.startTime != null and param.startTime != '' and param.finishTime != null and param.finishTime != ''">
-            AND A.user_create_time BETWEEN #{param.startTime} AND #{param.finishTime}
-        </if>
-        GROUP BY A.user_id
-        <if test="param.maxQuestionCount != null and param.maxQuestionCount > 0">
-            HAVING
-            <if test="param.minQuestionCount != null">
-                COUNT(C.user_id) >= #{param.minQuestionCount}
-            </if>
-            <if test="param.maxQuestionCount != null and param.maxQuestionCount > 0">
-                <if test="param.minQuestionCount != null">
-                    AND
-                </if>
-                COUNT(C.user_id) &lt; #{param.maxQuestionCount}
-            </if>
-        </if>
-    </select>
-    <insert id="insertLiveStudentData" parameterType="LiveStudentData">
-        insert into live_student_data
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="liveId != null">live_id,</if>
-            <if test="liveName != null">live_name,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="deptId != null">dept_id,</if>
-            <if test="userPhone != null">user_phone,</if>
-            <if test="userCreateTime != null">user_create_time,</if>
-            <if test="shareCount != null">share_count,</if>
-            <if test="deptName != null">dept_name,</if>
-            <if test="compayUserName != null">company_user_name,</if>
-            <if test="companyUserId != null">company_user_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="liveId != null">#{liveId},</if>
-            <if test="liveName != null">#{liveName},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="userPhone != null">#{userPhone},</if>
-            <if test="userCreateTime != null">#{userCreateTime},</if>
-            <if test="shareCount != null">#{shareCount},</if>
-            <if test="deptName != null">#{deptName},</if>
-            <if test="compayUserName != null">#{compayUserName},</if>
-            <if test="companyUserId != null">#{companyUserId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLiveStudentData" parameterType="LiveStudentData">
-        update live_student_data
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="liveName != null">live_name = #{liveName},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
-            <if test="userPhone != null">user_phone = #{userPhone},</if>
-            <if test="userCreateTime != null">user_create_time = #{userCreateTime},</if>
-            <if test="shareCount != null">share_count = #{shareCount},</if>
-            <if test="deptName != null">dept_name = #{deptName},</if>
-            <if test="compayUserName != null">company_user_name = #{compayUserName},</if>
-            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-        </trim>
-        where live_id = #{liveId}
-    </update>
-
-    <delete id="deleteLiveStudentDataByLiveId" parameterType="Long">
-        delete from live_student_data where live_id = #{liveId}
-    </delete>
-
-    <delete id="deleteLiveStudentDataByLiveIds" parameterType="String">
-        delete from live_student_data where live_id in 
-        <foreach item="liveId" collection="array" open="(" separator="," close=")">
-            #{liveId}
-        </foreach>
-    </delete>
-</mapper>