fix 直播

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/GoodsBusinessFieldController.java

@@ -0,0 +1,79 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldAddBo;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldQueryBo;
+import com.zhongzheng.modules.base.service.IGoodsBusinessFieldService;
+import com.zhongzheng.modules.base.vo.GoodsBusinessFieldVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 商品字段业务层次配置Controller
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Api(value = "商品字段业务层次配置控制器", tags = {"商品字段业务层次配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/field")
+public class GoodsBusinessFieldController extends BaseController {
+
+    private final IGoodsBusinessFieldService iGoodsBusinessFieldService;
+
+    /**
+     * 查询商品字段业务层次配置列表
+     */
+    @ApiOperation("查询商品字段业务层次配置列表")
+    @PreAuthorize("@ss.hasPermi('system:field:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsBusinessFieldVo> list(GoodsBusinessFieldQueryBo bo) {
+        startPage();
+        List<GoodsBusinessFieldVo> list = iGoodsBusinessFieldService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取商品字段业务层次配置详细信息
+     */
+    @ApiOperation("获取商品字段业务层次配置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:field:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GoodsBusinessFieldVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iGoodsBusinessFieldService.queryById(id));
+    }
+
+    /**
+     * 新增商品字段业务层次配置
+     */
+    @ApiOperation("新增商品字段业务层次配置")
+    @PreAuthorize("@ss.hasPermi('system:field:add')")
+    @Log(title = "商品字段业务层次配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody GoodsBusinessFieldAddBo bo) {
+        return toAjax(iGoodsBusinessFieldService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/GoodsFieldController.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.GoodsFieldQueryBo;
+import com.zhongzheng.modules.base.service.IGoodsFieldService;
+import com.zhongzheng.modules.base.vo.GoodsFieldVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 商品字段Controller
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Api(value = "商品字段控制器", tags = {"商品字段管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/goods/field")
+public class GoodsFieldController extends BaseController {
+
+    private final IGoodsFieldService iGoodsFieldService;
+
+    /**
+     * 查询商品字段列表
+     */
+    @ApiOperation("查询商品字段列表")
+    @PreAuthorize("@ss.hasPermi('system:field:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GoodsFieldVo> list(GoodsFieldQueryBo bo) {
+        startPage();
+        bo.setStatus(1);
+        List<GoodsFieldVo> list = iGoodsFieldService.queryList(bo);
+        return getDataTable(list);
+    }
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -87,6 +87,19 @@ public class ClassStudentController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询学员直播商品学习记录
+     */
+    @ApiOperation("查询学员直播商品学习记录")
+    @PreAuthorize("@ss.hasPermi('grade:student:list')")
+    @GetMapping("/listLive")
+    public TableDataInfo<GoodsStudyRecordVo> listLive(UserQueryBo bo) {
+        startPage();
+        List<GoodsStudyRecordVo> list = iUserStudyRecordService.queryLiveGoods(bo);
+
+        return getDataTable(list);
+    }
+
 
     /**
      * 查询学员课程科目学习记录

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -143,5 +143,11 @@ public class UserStudyRecordController extends BaseController {
         return AjaxResult.success(iUserStudyRecordService.getLastLive(bo));
     }
 
-
+    @ApiOperation("查询用户最后一次看的直播节的信息")
+    @GetMapping("/queryLiveLast")
+    public AjaxResult<UserStudyRecordVo> queryLiveLast(UserStudyRecordQueryBo bo) throws Exception {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserStudyRecordService.queryLiveLast(bo));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsBusinessFieldAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 商品字段业务层次配置添加对象 goods_business_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段业务层次配置添加对象")
+public class GoodsBusinessFieldAddBo {
+
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+    /** 字段ID */
+    @ApiModelProperty("字段ID")
+    private List<Long> fieldId;
+    /** 0非必填 1必填 */
+    @ApiModelProperty("0非必填 1必填")
+    private Integer require;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsBusinessFieldEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 商品字段业务层次配置编辑对象 goods_business_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段业务层次配置编辑对象")
+public class GoodsBusinessFieldEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+    /** 字段ID */
+    @ApiModelProperty("字段ID")
+    private Long fieldId;
+
+    /** 0非必填 1必填 */
+    @ApiModelProperty("0非必填 1必填")
+    private Integer require;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsBusinessFieldQueryBo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 商品字段业务层次配置分页查询对象 goods_business_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商品字段业务层次配置分页查询对象")
+public class GoodsBusinessFieldQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 业务层次ID */
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	/** 字段ID */
+	@ApiModelProperty("字段ID")
+	private Long fieldId;
+	/** 0非必填 1必填 */
+	@ApiModelProperty("0非必填 1必填")
+	private Integer require;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsFieldAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品字段添加对象 goods_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段添加对象")
+public class GoodsFieldAddBo {
+
+    /** 字段名 */
+    @ApiModelProperty("字段名")
+    private String fieldName;
+    /** 字段KEY */
+    @ApiModelProperty("字段KEY")
+    private String fieldKey;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsFieldEditBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 商品字段编辑对象 goods_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段编辑对象")
+public class GoodsFieldEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long fieldId;
+
+    /** 字段名 */
+    @ApiModelProperty("字段名")
+    private String fieldName;
+
+    /** 字段KEY */
+    @ApiModelProperty("字段KEY")
+    private String fieldKey;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/GoodsFieldQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 商品字段分页查询对象 goods_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商品字段分页查询对象")
+public class GoodsFieldQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 字段名 */
+	@ApiModelProperty("字段名")
+	private String fieldName;
+	/** 字段KEY */
+	@ApiModelProperty("字段KEY")
+	private String fieldKey;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/GoodsBusinessField.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.base.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 商品字段业务层次配置对象 goods_business_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_business_field")
+public class GoodsBusinessField implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 业务层次ID */
+    private Long businessId;
+    /** 字段ID */
+    private Long fieldId;
+    /** 0非必填 1必填 */
+    private Integer require;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/GoodsField.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.base.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 商品字段对象 goods_field
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_field")
+public class GoodsField implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "field_id")
+    private Long fieldId;
+    /** 字段名 */
+    private String fieldName;
+    /** 字段KEY */
+    private String fieldKey;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/GoodsBusinessFieldMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.GoodsBusinessField;
+
+/**
+ * 商品字段业务层次配置Mapper接口
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+public interface GoodsBusinessFieldMapper extends BaseMapper<GoodsBusinessField> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/GoodsFieldMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.GoodsField;
+
+/**
+ * 商品字段Mapper接口
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+public interface GoodsFieldMapper extends BaseMapper<GoodsField> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IGoodsBusinessFieldService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldAddBo;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldEditBo;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldQueryBo;
+import com.zhongzheng.modules.base.domain.GoodsBusinessField;
+import com.zhongzheng.modules.base.vo.GoodsBusinessFieldVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品字段业务层次配置Service接口
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+public interface IGoodsBusinessFieldService extends IService<GoodsBusinessField> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsBusinessFieldVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsBusinessFieldVo> queryList(GoodsBusinessFieldQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商品字段业务层次配置
+	 * @param bo 商品字段业务层次配置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsBusinessFieldAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商品字段业务层次配置
+	 * @param bo 商品字段业务层次配置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsBusinessFieldEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IGoodsFieldService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.base.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.GoodsFieldAddBo;
+import com.zhongzheng.modules.base.bo.GoodsFieldEditBo;
+import com.zhongzheng.modules.base.bo.GoodsFieldQueryBo;
+import com.zhongzheng.modules.base.domain.GoodsField;
+import com.zhongzheng.modules.base.vo.GoodsFieldVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品字段Service接口
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+public interface IGoodsFieldService extends IService<GoodsField> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GoodsFieldVo queryById(Long fieldId);
+
+	/**
+	 * 查询列表
+	 */
+	List<GoodsFieldVo> queryList(GoodsFieldQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商品字段
+	 * @param bo 商品字段新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(GoodsFieldAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商品字段
+	 * @param bo 商品字段编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(GoodsFieldEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/GoodsBusinessFieldServiceImpl.java

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldAddBo;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldEditBo;
+import com.zhongzheng.modules.base.bo.GoodsBusinessFieldQueryBo;
+import com.zhongzheng.modules.base.domain.GoodsBusinessField;
+import com.zhongzheng.modules.base.mapper.GoodsBusinessFieldMapper;
+import com.zhongzheng.modules.base.service.IGoodsBusinessFieldService;
+import com.zhongzheng.modules.base.vo.GoodsBusinessFieldVo;
+import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 商品字段业务层次配置Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Service
+public class GoodsBusinessFieldServiceImpl extends ServiceImpl<GoodsBusinessFieldMapper, GoodsBusinessField> implements IGoodsBusinessFieldService {
+
+    @Override
+    public GoodsBusinessFieldVo queryById(Long id){
+        GoodsBusinessField db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, GoodsBusinessFieldVo.class);
+    }
+
+    @Override
+    public List<GoodsBusinessFieldVo> queryList(GoodsBusinessFieldQueryBo bo) {
+        LambdaQueryWrapper<GoodsBusinessField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getBusinessId() != null, GoodsBusinessField::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getFieldId() != null, GoodsBusinessField::getFieldId, bo.getFieldId());
+        lqw.eq(bo.getRequire() != null, GoodsBusinessField::getRequire, bo.getRequire());
+        lqw.eq(bo.getStatus() != null, GoodsBusinessField::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsBusinessFieldVo> entity2Vo(Collection<GoodsBusinessField> collection) {
+        List<GoodsBusinessFieldVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsBusinessFieldVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsBusinessField> page = (Page<GoodsBusinessField>)collection;
+            Page<GoodsBusinessFieldVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsBusinessFieldAddBo bo) {
+        Collection<GoodsBusinessField> coll = new HashSet<>();
+        for(Long id : bo.getFieldId()){
+            GoodsBusinessField add = BeanUtil.toBean(bo, GoodsBusinessField.class);
+            add.setFieldId(id);
+            validEntityBeforeSave(add);
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            coll.add(add);
+        }
+        return saveBatch(coll);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsBusinessFieldEditBo bo) {
+        GoodsBusinessField update = BeanUtil.toBean(bo, GoodsBusinessField.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsBusinessField entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/GoodsFieldServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.GoodsFieldAddBo;
+import com.zhongzheng.modules.base.bo.GoodsFieldEditBo;
+import com.zhongzheng.modules.base.bo.GoodsFieldQueryBo;
+import com.zhongzheng.modules.base.domain.GoodsField;
+import com.zhongzheng.modules.base.mapper.GoodsFieldMapper;
+import com.zhongzheng.modules.base.service.IGoodsFieldService;
+import com.zhongzheng.modules.base.vo.GoodsFieldVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 商品字段Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Service
+public class GoodsFieldServiceImpl extends ServiceImpl<GoodsFieldMapper, GoodsField> implements IGoodsFieldService {
+
+    @Override
+    public GoodsFieldVo queryById(Long fieldId){
+        GoodsField db = this.baseMapper.selectById(fieldId);
+        return BeanUtil.toBean(db, GoodsFieldVo.class);
+    }
+
+    @Override
+    public List<GoodsFieldVo> queryList(GoodsFieldQueryBo bo) {
+        LambdaQueryWrapper<GoodsField> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getFieldName()), GoodsField::getFieldName, bo.getFieldName());
+        lqw.eq(StrUtil.isNotBlank(bo.getFieldKey()), GoodsField::getFieldKey, bo.getFieldKey());
+        lqw.eq(bo.getStatus() != null, GoodsField::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<GoodsFieldVo> entity2Vo(Collection<GoodsField> collection) {
+        List<GoodsFieldVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, GoodsFieldVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<GoodsField> page = (Page<GoodsField>)collection;
+            Page<GoodsFieldVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(GoodsFieldAddBo bo) {
+        GoodsField add = BeanUtil.toBean(bo, GoodsField.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(GoodsFieldEditBo bo) {
+        GoodsField update = BeanUtil.toBean(bo, GoodsField.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GoodsField entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/GoodsBusinessFieldVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.base.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品字段业务层次配置视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段业务层次配置视图对象")
+public class GoodsBusinessFieldVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 业务层次ID */
+	@Excel(name = "业务层次ID")
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	/** 字段ID */
+	@Excel(name = "字段ID")
+	@ApiModelProperty("字段ID")
+	private Long fieldId;
+	/** 0非必填 1必填 */
+	@Excel(name = "0非必填 1必填")
+	@ApiModelProperty("0非必填 1必填")
+	private Integer require;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/GoodsFieldVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.base.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商品字段视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-06-06
+ */
+@Data
+@ApiModel("商品字段视图对象")
+public class GoodsFieldVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long fieldId;
+
+	/** 字段名 */
+	@Excel(name = "字段名")
+	@ApiModelProperty("字段名")
+	private String fieldName;
+	/** 字段KEY */
+	@Excel(name = "字段KEY")
+	@ApiModelProperty("字段KEY")
+	private String fieldKey;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -101,4 +101,7 @@ public class CourseQueryBo extends BaseEntity {
 
 	@ApiModelProperty("讲义key")
 	private String key;
+
+	@ApiModelProperty("科目id多个")
+	private List<Long> subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -160,4 +160,7 @@ public class GoodsAddBo {
     /** 讲师ID */
     @ApiModelProperty("讲师ID")
     private Long teacherId;
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -189,4 +189,7 @@ public class GoodsEditBo {
     /** 讲师ID */
     @ApiModelProperty("讲师ID")
     private Long teacherId;
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -172,4 +172,7 @@ GoodsQueryBo extends BaseEntity {
 	/** 是否返回订单数量 */
 	@ApiModelProperty("是否返回订单数量 1带 0不带")
 	private Long getOrderNum;
+	/** 科目ID，拼接 */
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -128,4 +128,6 @@ private static final long serialVersionUID=1L;
     private Long doNumber;
     /** 讲师ID */
     private Long teacherId;
+    /** 科目ID，拼接 */
+    private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -280,4 +280,8 @@ public class GoodsVo {
 	private Long teacherId;
 	@ApiModelProperty("直播商品数量")
 	private Integer goodsLiveNum;
+	/** 科目ID，拼接 */
+	@Excel(name = "科目ID，拼接")
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -182,7 +182,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	@Excel(name = "保利威真实直播时长，单位秒")
 	@ApiModelProperty("保利威真实直播时长，单位秒")
 	private Long realDuration;
-
+	@ApiModelProperty("节名称")
+	private String sectionName;
 
 	@Override
 	public int compareTo(ClassPeriodVo o) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SubjectStudyRecordQueryBo.java

@@ -79,5 +79,5 @@ public class SubjectStudyRecordQueryBo extends BaseEntity {
     /** 已学节数 */
     @ApiModelProperty("已学节数")
     private Long recordNum;
-
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -29,6 +29,8 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
 
     List<GoodsStudyRecordVo> queryGoods(UserQueryBo bo);
 
+    List<GoodsStudyRecordVo> queryLiveGoods(UserQueryBo bo);
+
     List<SubjectStudyRecordVo> listSubject(SubjectStudyRecordQueryBo bo);
 
     Long getUserSeeTime(UserStudyRecordQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -32,6 +32,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	UserStudyRecordVo queryLast(UserStudyRecordQueryBo bo);
 
+	UserStudyRecordVo queryLiveLast(UserStudyRecordQueryBo bo);
+
 	Boolean delUserCourseHistory(Long userId,Long goodsId, Long gradeId,Long orderGoodsId);
 
 	/**
@@ -71,6 +73,8 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	List<GoodsStudyRecordVo> queryGoods(UserQueryBo bo);
 
+	List<GoodsStudyRecordVo> queryLiveGoods(UserQueryBo bo);
+
 	List<SubjectStudyRecordVo> listSubject(SubjectStudyRecordQueryBo bo);
 
 	List<SectionStudyRecordVo> listSection(SubjectStudyRecordQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -169,6 +169,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         lqw.eq(bo.getModuleId() != null, UserStudyRecord::getModuleId, bo.getModuleId());
         lqw.eq(bo.getChapterId() != null, UserStudyRecord::getChapterId, bo.getChapterId());
         lqw.eq(bo.getGradeId() != null, UserStudyRecord::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, UserStudyRecord::getOrderGoodsId, bo.getOrderGoodsId());
         lqw.eq( UserStudyRecord::getCurrentStatus, 1);
         lqw.orderByDesc(UserStudyRecord::getRecordId);
         UserStudyRecord last = this.getOne(lqw.last("limit 1"));
@@ -178,6 +179,23 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return BeanUtil.toBean(last, UserStudyRecordVo.class);
     }
 
+    @Override
+    public UserStudyRecordVo queryLiveLast(UserStudyRecordQueryBo bo) {
+        LambdaQueryWrapper<UserStudyRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserStudyRecord::getUserId, bo.getUserId());
+        lqw.eq(bo.getCourseId() != null, UserStudyRecord::getCourseId, bo.getCourseId());
+        lqw.eq(bo.getSectionId() != null, UserStudyRecord::getSectionId, bo.getSectionId());
+        lqw.eq(bo.getGoodsId() != null, UserStudyRecord::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getModuleId() != null, UserStudyRecord::getModuleId, bo.getModuleId());
+        lqw.eq(bo.getChapterId() != null, UserStudyRecord::getChapterId, bo.getChapterId());
+        lqw.eq(bo.getGradeId() != null, UserStudyRecord::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, UserStudyRecord::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq( UserStudyRecord::getCurrentStatus, 1);
+        lqw.orderByDesc(UserStudyRecord::getRecordId);
+        UserStudyRecord last = this.getOne(lqw.last("limit 1"));
+        return BeanUtil.toBean(last, UserStudyRecordVo.class);
+    }
+
     @Override
     public Boolean delUserCourseHistory(Long userId, Long goodsId, Long gradeId,Long orderGoodsId) {
         //删除看视频历史历史
@@ -822,6 +840,52 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return list;
     }
 
+    @Override
+    public List<GoodsStudyRecordVo> queryLiveGoods(UserQueryBo bo) {
+        //查询学员拥有商品
+        List<GoodsStudyRecordVo> list = baseMapper.queryLiveGoods(bo);
+
+        for (GoodsStudyRecordVo goodsStudyRecordVo : list) {
+            Long secLong = 0L;
+            Long studyLong = 0L;
+            //查询学习记录
+            SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+            subjectStudyRecordQueryBo.setGoodsId(goodsStudyRecordVo.getGoodsId());
+            subjectStudyRecordQueryBo.setUserId(goodsStudyRecordVo.getUserId());
+            subjectStudyRecordQueryBo.setOrderGoodsId(goodsStudyRecordVo.getOrderGoodsId());
+            List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+
+            for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
+                String sectionType = "";
+                secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
+                studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
+                //节里面有什么类型
+                if (CollectionUtils.isNotEmpty(baseMapper.sectionType(subjectStudyRecordVo.getCourseId(), 1L))) {
+                    sectionType = sectionType.concat("1,");
+                }
+                if (CollectionUtils.isNotEmpty(baseMapper.sectionType(subjectStudyRecordVo.getCourseId(), 2L))) {
+                    sectionType = sectionType.concat("2,");
+                }
+                if (CollectionUtils.isNotEmpty(baseMapper.sectionType(subjectStudyRecordVo.getCourseId(), 3L))) {
+                    sectionType = sectionType.concat("3,");
+                }
+                if (StringUtils.isNotBlank(sectionType)) {
+                    subjectStudyRecordVo.setSectionType(sectionType.substring(0, sectionType.length() - 1));
+                }
+            }
+            BigDecimal divide = new BigDecimal("0");
+            if (secLong != 0) {
+                divide = new BigDecimal(studyLong.toString()).divide(new BigDecimal(secLong.toString()), 2, BigDecimal.ROUND_HALF_UP);
+            }
+            goodsStudyRecordVo.setStudyNum(divide.multiply(new BigDecimal("100")).longValue());
+            goodsStudyRecordVo.setSubjectStudyRecordVos(subjectStudyRecordVos);
+            goodsStudyRecordVo.setSecAllNum(secLong);
+            goodsStudyRecordVo.setStuAllNum(studyLong);
+        }
+
+        return list;
+    }
+
     @Override
     public List<SubjectStudyRecordVo> listSubject(SubjectStudyRecordQueryBo bo) {
         List<SubjectStudyRecordVo> subjectStudyRecordVos = baseMapper.listSubject(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/GoodsStudyRecordVo.java

@@ -107,5 +107,6 @@ public class GoodsStudyRecordVo {
     @Excel(name = "服务有效期结束")
     @ApiModelProperty("服务有效期结束")
     private Long serviceEndTime;
+    private Long orderGoodsId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -240,6 +240,9 @@ public class UserVo {
 	@ApiModelProperty("商品题库数")
 	private Long goodsBankNum;
 
+	@ApiModelProperty("商品直播数")
+	private Long goodsLiveNum;
+
 	/** 导入编号 */
 	@Excel(name = "导入编号")
 	@ApiModelProperty("导入编号")

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -274,6 +274,12 @@
         LEFT JOIN course_subject cs ON cs.id = c.subject_id AND cs.status =1
         WHERE
         1 = 1 AND c.status !=-1
+        <if test="subjectIds != null and subjectIds.size()!=0 ">
+            AND c.subject_id in
+            <foreach collection="subjectIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="status != null and status.size()!=0 ">
             AND c.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examNumber" column="exam_number"/>
         <result property="doNumber" column="do_number"/>
         <result property="teacherId" column="teacher_id"/>
+        <result property="subjectIds" column="subject_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -114,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderNum" column="order_num"/>
         <result property="teacherId" column="teacher_id"/>
         <result property="goodsLiveNum" column="goods_live_num"/>
+        <result property="subjectIds" column="subject_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -144,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveEndTime" column="live_end_time"/>
         <result property="liveUrl" column="live_url"/>
         <result property="realDuration" column="real_duration"/>
+        <result property="sectionName" column="section_name"/>
     </resultMap>
 
 
@@ -207,6 +208,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY u.create_time desc
     </select>
 
+    <select id="queryLiveGoods" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo"  resultMap="GoodsStudyRecordVoResult">
+        SELECT
+        g.goods_name,
+        g.`code`,
+        g.`year`,
+        g.class_hours,
+        g.study_start_time,
+        g.study_end_time,
+        g.goods_id,
+        o.user_id,
+        og.service_start_time,
+        og.service_end_time,
+        og.order_goods_id,
+        (SELECT i.business_name FROM course_business i where i.id = g.business_id) as business_name,
+        (SELECT p.project_name FROM course_project_type p where p.id = g.project_id) as project_name,
+        (SELECT e.education_name FROM course_education_type e  where e.id = g.education_type_id) as education_name,
+        (SELECT r.start_time FROM user_study_record r  where 1=1  and r.user_id = #{userId} AND g.goods_id=r.goods_id ORDER BY r.start_time ASC LIMIT 1) as start_time,
+        (SELECT r.end_time FROM user_study_record r  where 1=1 and r.user_id = #{userId} AND g.goods_id=r.goods_id ORDER BY r.start_time DESC LIMIT 1) as end_time
+        FROM
+        `order` o
+        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        LEFT JOIN goods g on g.goods_id = og.goods_id
+        where 1=1
+        AND og.refund_status in (0,1,3)
+        AND og.pay_status in (2,3,4)
+        AND o.`status` = 1
+        AND g.goods_type = 6
+        <if test="userId != null and userId !=''">
+            and o.user_id = #{userId}
+        </if>
+        ORDER BY o.create_time desc
+    </select>
+
 
     <select id="listSubject" parameterType="com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo"  resultMap="SubjectStudyRecordVoResult">
         SELECT
@@ -221,7 +255,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT COUNT(id)+(SELECT COUNT(n.id) FROM course_chapter_section n LEFT JOIN course_module_chapter p on n.chapter_id = p.chapter_id LEFT JOIN course_menu m on m.menu_id = p.module_id where m.course_id =  r.course_id and m.type in(1))+(SELECT COUNT(n.id) FROM course_chapter_section n  LEFT JOIN course_menu m on m.menu_id = n.chapter_id where m.course_id = r.course_id and m.type in(2)) FROM course_menu m where  m.course_id = r.course_id and m.type in(3)) as section_num,
         (select COUNT(DISTINCT course_id,module_id,chapter_id,section_id) FROM user_study_record c where 1=1
         AND  c.course_id = r.course_id
-         and c.current_status=1 and  c.grade_id=#{gradeId} and c.user_id=#{userId} and c.status = 1 and c.goods_id = #{goodsId}) as record_num
+         and c.current_status=1
+        <if test="gradeId != null and gradeId !=''">
+            and c.grade_id=#{gradeId}
+        </if>
+        <if test="orderGoodsId != null and orderGoodsId !=''">
+            and c.order_goods_id=#{orderGoodsId}
+        </if>
+         and c.user_id=#{userId} and c.status = 1 and c.goods_id = #{goodsId}) as record_num
         FROM
         course r
         LEFT JOIN goods_course c ON c.course_id = r.course_id
@@ -1107,7 +1148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         NULL as live_start_time,
         NULL as live_end_time,
         NULL as live_url,
-        NULL as real_duration
+        NULL as real_duration,
+        NULL as section_name
         FROM
         course_menu cm
         where 1=1
@@ -1125,7 +1167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         NULL as live_start_time,
         NULL as live_end_time,
         NULL as live_url,
-        NULL as real_duration
+        NULL as real_duration,
+        NULL as section_name
         FROM
         course_menu cm
         LEFT JOIN goods_course gc on gc.course_id = cm.course_id
@@ -1142,7 +1185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cs.live_start_time,
         cs.live_end_time,
         cs.live_url,
-        cs.real_duration
+        cs.real_duration,
+        cs.name as section_name
         FROM
         course_menu cm
         LEFT JOIN course_section cs on cm.menu_id = cs.section_id
@@ -1162,7 +1206,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cs.live_start_time,
         cs.live_end_time,
         cs.live_url,
-        cs.real_duration
+        cs.real_duration,
+        cs.name as section_name
         FROM
         course_chapter_section ccs
         LEFT JOIN course_section cs on ccs.section_id = cs.section_id