订单数

zhongzheng-api/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -6,6 +6,7 @@ import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvVideoService;
 import com.zhongzheng.modules.polyv.vo.PolyvVideoQuerVo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -48,5 +50,11 @@ public class PolyvVideoController extends BaseController {
         return AjaxResult.success(map);
     }
 
-
+    @ApiOperation("保利威视频小程序播放回调")
+    @GetMapping("/sign/auth")
+    public AjaxResult callAuth(PolyvLiveQueryBo bo) throws Exception {
+        Map<String,Object> map = new HashMap<>();
+        map.put("uid","egsxlptzdq");
+        return AjaxResult.success(map);
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户节拍照记录添加对象 course_photo_log
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+@Data
+@ApiModel("用户节拍照记录添加对象")
+public class CoursePhotoLogAddBo {
+
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+    /** 照片地址 */
+    @ApiModelProperty("照片地址")
+    private String photo;
+    /** 拍照时的视频秒数 */
+    @ApiModelProperty("拍照时的视频秒数")
+    private Long photoTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** 需要的拍照总数 */
+    @ApiModelProperty("需要的拍照总数")
+    private Long photoNum;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户节拍照记录编辑对象 course_photo_log
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+@Data
+@ApiModel("用户节拍照记录编辑对象")
+public class CoursePhotoLogEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+
+    /** 照片地址 */
+    @ApiModelProperty("照片地址")
+    private String photo;
+
+    /** 拍照时的视频秒数 */
+    @ApiModelProperty("拍照时的视频秒数")
+    private Long photoTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** 需要的拍照总数 */
+    @ApiModelProperty("需要的拍照总数")
+    private Long photoNum;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+}

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

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 用户节拍照记录分页查询对象 course_photo_log
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户节拍照记录分页查询对象")
+public class CoursePhotoLogQueryBo 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 sectionId;
+	/** 照片地址 */
+	@ApiModelProperty("照片地址")
+	private String photo;
+	/** 拍照时的视频秒数 */
+	@ApiModelProperty("拍照时的视频秒数")
+	private Long photoTime;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 需要的拍照总数 */
+	@ApiModelProperty("需要的拍照总数")
+	private Long photoNum;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CoursePhotoLog.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 用户节拍照记录对象 course_photo_log
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("course_photo_log")
+public class CoursePhotoLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 节ID */
+    private Long sectionId;
+    /** 照片地址 */
+    private String photo;
+    /** 拍照时的视频秒数 */
+    private Long photoTime;
+    /** $column.columnComment */
+    private Long userId;
+    /** 需要的拍照总数 */
+    private Long photoNum;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CoursePhotoLogMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.domain.CoursePhotoLog;
+
+/**
+ * 用户节拍照记录Mapper接口
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+public interface CoursePhotoLogMapper extends BaseMapper<CoursePhotoLog> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICoursePhotoLogService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogAddBo;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogEditBo;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogQueryBo;
+import com.zhongzheng.modules.course.domain.CoursePhotoLog;
+import com.zhongzheng.modules.course.vo.CoursePhotoLogVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户节拍照记录Service接口
+ *
+ * @author hjl
+ * @date 2022-01-12
+ */
+public interface ICoursePhotoLogService extends IService<CoursePhotoLog> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CoursePhotoLogVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<CoursePhotoLogVo> queryList(CoursePhotoLogQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户节拍照记录
+	 * @param bo 用户节拍照记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CoursePhotoLogAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户节拍照记录
+	 * @param bo 用户节拍照记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CoursePhotoLogEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CoursePhotoLogServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogAddBo;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogEditBo;
+import com.zhongzheng.modules.course.bo.CoursePhotoLogQueryBo;
+import com.zhongzheng.modules.course.domain.CoursePhotoLog;
+import com.zhongzheng.modules.course.mapper.CoursePhotoLogMapper;
+import com.zhongzheng.modules.course.service.ICoursePhotoLogService;
+import com.zhongzheng.modules.course.vo.CoursePhotoLogVo;
+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-01-12
+ */
+@Service
+public class CoursePhotoLogServiceImpl extends ServiceImpl<CoursePhotoLogMapper, CoursePhotoLog> implements ICoursePhotoLogService {
+
+    @Override
+    public CoursePhotoLogVo queryById(Long id){
+        CoursePhotoLog db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CoursePhotoLogVo.class);
+    }
+
+    @Override
+    public List<CoursePhotoLogVo> queryList(CoursePhotoLogQueryBo bo) {
+        LambdaQueryWrapper<CoursePhotoLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSectionId() != null, CoursePhotoLog::getSectionId, bo.getSectionId());
+        lqw.eq(StrUtil.isNotBlank(bo.getPhoto()), CoursePhotoLog::getPhoto, bo.getPhoto());
+        lqw.eq(bo.getPhotoTime() != null, CoursePhotoLog::getPhotoTime, bo.getPhotoTime());
+        lqw.eq(bo.getUserId() != null, CoursePhotoLog::getUserId, bo.getUserId());
+        lqw.eq(bo.getPhotoNum() != null, CoursePhotoLog::getPhotoNum, bo.getPhotoNum());
+        lqw.eq(bo.getStatus() != null, CoursePhotoLog::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CoursePhotoLogVo> entity2Vo(Collection<CoursePhotoLog> collection) {
+        List<CoursePhotoLogVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CoursePhotoLogVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CoursePhotoLog> page = (Page<CoursePhotoLog>)collection;
+            Page<CoursePhotoLogVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CoursePhotoLogAddBo bo) {
+        CoursePhotoLog add = BeanUtil.toBean(bo, CoursePhotoLog.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CoursePhotoLogEditBo bo) {
+        CoursePhotoLog update = BeanUtil.toBean(bo, CoursePhotoLog.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CoursePhotoLog 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/course/vo/CoursePhotoLogVo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.course.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-01-12
+ */
+@Data
+@ApiModel("用户节拍照记录视图对象")
+public class CoursePhotoLogVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 节ID */
+	@Excel(name = "节ID")
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 照片地址 */
+	@Excel(name = "照片地址")
+	@ApiModelProperty("照片地址")
+	private String photo;
+	/** 拍照时的视频秒数 */
+	@Excel(name = "拍照时的视频秒数")
+	@ApiModelProperty("拍照时的视频秒数")
+	private Long photoTime;
+	/** $column.columnComment */
+	@Excel(name = "拍照时的视频秒数")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 需要的拍照总数 */
+	@Excel(name = "需要的拍照总数")
+	@ApiModelProperty("需要的拍照总数")
+	private Long photoNum;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvLiveQueryBo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.polyv.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 保利威视频信息分页查询对象 polyv_video
+ *
+ * @author change
+ * @date 2021-06-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("保利威视频信息分页查询对象")
+public class PolyvLiveQueryBo extends BaseEntity {
+
+
+	@ApiModelProperty("频道号")
+	private String channelId;
+
+
+
+
+}

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

@@ -142,5 +142,7 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("1空")
 	private Long empty;
 
-
+	/** 是否返回订单数量 */
+	@ApiModelProperty("是否返回订单数量 1带 0不带")
+	private Long getOrderNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -182,4 +182,10 @@ private static final long serialVersionUID=1L;
     /** 密码 */
     private String password;
 
+    /** 商品视频数 */
+    private Long goodsCourseNum;
+
+    /** 商品题库数 */
+    private Long goodsBankNum;
+
 }

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

@@ -232,6 +232,14 @@ public class UserVo {
 	@ApiModelProperty("1在职 0离职")
 	private Long jobStatus;
 
+	/** 商品视频数 */
+	@ApiModelProperty("商品视频数")
+	private Long goodsCourseNum;
+
+	/** 商品题库数 */
+	@ApiModelProperty("商品题库数")
+	private Long goodsBankNum;
+
 	/** 1在职 0离职 */
 	@Excel(name = "班級")
 	@ApiModelProperty("班級")

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

@@ -0,0 +1,20 @@
+<?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.zhongzheng.modules.course.mapper.CoursePhotoLogMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.CoursePhotoLog" id="CoursePhotoLogResult">
+        <result property="id" column="id"/>
+        <result property="sectionId" column="section_id"/>
+        <result property="photo" column="photo"/>
+        <result property="photoTime" column="photo_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="photoNum" column="photo_num"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseNum" column="course_num"/>
         <result property="studyTime" column="study_time"/>
         <result property="password" column="password"/>
+        <result property="goodsCourseNum" column="goods_course_num"/>
+        <result property="goodsBankNum" column="goods_bank_num"/>
     </resultMap>
 
 
@@ -136,8 +138,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
         SELECT
         u.*
+        <if test="getOrderNum != null and getOrderNum == 1" >
+        ,ou.goods_course_num,ou.goods_bank_num
+        </if>
         FROM
         `user` u
+        <if test="getOrderNum != null and getOrderNum == 1" >
+            LEFT JOIN (
+            SELECT
+            sum( CASE WHEN g.goods_type = 1 THEN 1 ELSE 0 END ) AS goods_course_num,
+            sum( CASE WHEN g.goods_type = 2 THEN 1 ELSE 0 END ) AS goods_bank_num,
+            o.user_id
+            FROM
+            `order` o
+            LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+            LEFT JOIN goods g ON og.goods_id = g.goods_id
+            WHERE o.`status` = 1
+            GROUP BY
+            o.user_id
+            ) ou ON u.user_id = ou.user_id
+        </if>
         WHERE
         1 = 1
         <if test="status != null and status.size()!=0 ">
@@ -170,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gradePoint != null and gradePoint == 2" >
             AND (SELECT COUNT(u.user_id) FROM class_grade_user cgu where 1=1 AND u.status in (1) and cgu.user_id= u.user_id) = 0
         </if>
+
     </select>