视频分类修改
This commit is contained in:
@ -1,11 +1,13 @@
|
||||
package com.stdiet.custom.domain;
|
||||
|
||||
import com.stdiet.custom.dto.response.VideoClassifyTwoResponse;
|
||||
import lombok.Data;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.stdiet.common.annotation.Excel;
|
||||
import com.stdiet.common.core.domain.BaseEntity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 视频分类对象 sys_video_classify
|
||||
*
|
||||
@ -24,10 +26,20 @@ public class SysVideoClassify extends BaseEntity
|
||||
@Excel(name = "分类名称")
|
||||
private String cateName;
|
||||
|
||||
private Long parentId;
|
||||
|
||||
private Integer orderNum;
|
||||
|
||||
/** 类型标识,0全部可看 1客户可看 2额外付费观看 */
|
||||
@Excel(name = "类型标识,0全部可看 1客户可看 2额外付费观看")
|
||||
private Integer payFlag;
|
||||
|
||||
/** 删除标识 0未删除 1已删除 */
|
||||
private Integer delFlag;
|
||||
|
||||
//子分类
|
||||
private List<SysVideoClassify> childrenClassify;
|
||||
|
||||
//子视频
|
||||
private List<Map<String, Object>> childrenVideo;
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package com.stdiet.custom.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class VideoClassifyResponse implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//目录分类ID
|
||||
private Long id;
|
||||
|
||||
//目录分类名称
|
||||
private String cateName;
|
||||
|
||||
//子分类
|
||||
private List<VideoClassifyTwoResponse> childrenClassify;
|
||||
|
||||
//子视频
|
||||
private List<Map<String, Object>> childrenVideo;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getCateName() {
|
||||
return cateName;
|
||||
}
|
||||
|
||||
public void setCateName(String cateName) {
|
||||
this.cateName = cateName;
|
||||
}
|
||||
|
||||
public List<VideoClassifyTwoResponse> getChildrenClassify() {
|
||||
return childrenClassify;
|
||||
}
|
||||
|
||||
public void setChildrenClassify(List<VideoClassifyTwoResponse> childrenClassify) {
|
||||
this.childrenClassify = childrenClassify;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getChildrenVideo() {
|
||||
return childrenVideo;
|
||||
}
|
||||
|
||||
public void setChildrenVideo(List<Map<String, Object>> childrenVideo) {
|
||||
this.childrenVideo = childrenVideo;
|
||||
}
|
||||
}
|
@ -0,0 +1,45 @@
|
||||
package com.stdiet.custom.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class VideoClassifyThreeResponse implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//目录分类ID
|
||||
private Long id;
|
||||
|
||||
//目录分类名称
|
||||
private String cateName;
|
||||
|
||||
//子视频
|
||||
private List<Map<String, Object>> childrenVideo;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getCateName() {
|
||||
return cateName;
|
||||
}
|
||||
|
||||
public void setCateName(String cateName) {
|
||||
this.cateName = cateName;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getChildrenVideo() {
|
||||
return childrenVideo;
|
||||
}
|
||||
|
||||
public void setChildrenVideo(List<Map<String, Object>> childrenVideo) {
|
||||
this.childrenVideo = childrenVideo;
|
||||
}
|
||||
}
|
@ -0,0 +1,56 @@
|
||||
package com.stdiet.custom.dto.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class VideoClassifyTwoResponse implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//目录分类ID
|
||||
private Long id;
|
||||
|
||||
//目录分类名称
|
||||
private String cateName;
|
||||
|
||||
//子分类
|
||||
private List<VideoClassifyThreeResponse> childrenClassify;
|
||||
|
||||
//子视频
|
||||
private List<Map<String, Object>> childrenVideo;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getCateName() {
|
||||
return cateName;
|
||||
}
|
||||
|
||||
public void setCateName(String cateName) {
|
||||
this.cateName = cateName;
|
||||
}
|
||||
|
||||
public List<VideoClassifyThreeResponse> getChildrenClassify() {
|
||||
return childrenClassify;
|
||||
}
|
||||
|
||||
public void setChildrenClassify(List<VideoClassifyThreeResponse> childrenClassify) {
|
||||
this.childrenClassify = childrenClassify;
|
||||
}
|
||||
|
||||
public List<Map<String, Object>> getChildrenVideo() {
|
||||
return childrenVideo;
|
||||
}
|
||||
|
||||
public void setChildrenVideo(List<Map<String, Object>> childrenVideo) {
|
||||
this.childrenVideo = childrenVideo;
|
||||
}
|
||||
}
|
@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.stdiet.custom.domain.SysVideoClassify;
|
||||
import com.stdiet.custom.dto.response.VideoClassifyResponse;
|
||||
|
||||
/**
|
||||
* 视频分类Mapper接口
|
||||
@ -63,5 +64,12 @@ public interface SysVideoClassifyMapper
|
||||
* 获取所有类别
|
||||
* @return
|
||||
*/
|
||||
public List<SysVideoClassify> getAllClassify();
|
||||
public List<SysVideoClassify> getAllClassify(SysVideoClassify sysVideoClassify);
|
||||
|
||||
/**
|
||||
* 根据父级ID获取下面子分类以及视频
|
||||
* @param parentId
|
||||
* @return
|
||||
*/
|
||||
public List<SysVideoClassify> getOneAllClassifyAndVideo(Long parentId);
|
||||
}
|
@ -4,6 +4,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.stdiet.custom.domain.SysNutritionalVideo;
|
||||
import com.stdiet.custom.domain.SysVideoClassify;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
|
@ -2,6 +2,7 @@ package com.stdiet.custom.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.stdiet.custom.domain.SysVideoClassify;
|
||||
import com.stdiet.custom.dto.response.VideoClassifyResponse;
|
||||
|
||||
/**
|
||||
* 视频分类Service接口
|
||||
@ -63,5 +64,12 @@ public interface ISysVideoClassifyService
|
||||
* 获取所有类别
|
||||
* @return
|
||||
*/
|
||||
public List<SysVideoClassify> getAllClassify();
|
||||
public List<SysVideoClassify> getAllClassify(SysVideoClassify sysVideoClassify);
|
||||
|
||||
/**
|
||||
* 按分类层级分类,返回视频目录列表
|
||||
*
|
||||
* @return 视频分类集合
|
||||
*/
|
||||
public List<SysVideoClassify> getAllClassifyAndVideo(Long parentId);
|
||||
}
|
@ -378,7 +378,7 @@ public class SysOrderServiceImpl implements ISysOrderService {
|
||||
LocalDate newStartTime = null;
|
||||
//判断是否提成单,拆分单中的副单,体验单,定金单
|
||||
if(sysOrder.getStartTime() == null || sysOrder.getAfterSaleCommissOrder().intValue() == 1 || sysOrder.getMainOrderId().intValue() != 0 ||
|
||||
"2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType())){
|
||||
"2".equals(sysOrder.getOrderType()) || !isNeedByOrderMoneyType(sysOrder)){
|
||||
continue;
|
||||
}
|
||||
//判断前一个订单的结束时间是否大于第二个订单的
|
||||
@ -404,6 +404,21 @@ public class SysOrderServiceImpl implements ISysOrderService {
|
||||
return row;
|
||||
}
|
||||
|
||||
//定金单或尾款单是否需要生成食谱计划,2021-01-12修改为6月11日之后成交的订单只生成定金单计划
|
||||
private boolean isNeedByOrderMoneyType(SysOrder sysOrder){
|
||||
if("0".equals(sysOrder.getOrderMoneyType())){
|
||||
return true;
|
||||
}else{
|
||||
//成交时间
|
||||
LocalDate orderDate = DateUtils.dateToLocalDate(sysOrder.getOrderTime());
|
||||
if(ChronoUnit.DAYS.between(SysRecipesPlanServiceImpl.newVersionPlanStartDate, orderDate) >= 0){
|
||||
return "1".equals(sysOrder.getOrderMoneyType());
|
||||
}else{
|
||||
return "2".equals(sysOrder.getOrderMoneyType());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 给对象SysOrder对象设置服务到期时间
|
||||
*
|
||||
|
@ -44,6 +44,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
|
||||
@Autowired
|
||||
private SysRecipesMapper sysRecipesMapper;
|
||||
|
||||
//2021-06-11之后(大于等于)成交的订单,只生成定金单食谱计划,不生成尾款食谱计划,之前成交的订单还是保持之前逻辑
|
||||
public static final LocalDate newVersionPlanStartDate = DateUtils.stringToLocalDate("2021-06-11", "yyyy-MM-dd");
|
||||
|
||||
/**
|
||||
* 查询食谱计划
|
||||
*
|
||||
@ -172,7 +175,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
|
||||
//判断是否提成单,拆分单中的副单,体验单,定金单
|
||||
if (sysOrder.getAfterSaleCommissOrder().intValue() == 1 || sysOrder.getMainOrderId().intValue() != 0 ||
|
||||
// "2".equals(sysOrder.getOrderType()) || // 体验单也需要生成计划 2021.05.29
|
||||
"1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) {
|
||||
!isNeedByOrderMoneyType(sysOrder) || sysOrder.getCounted() == 1) {
|
||||
System.out.println("---------------------" + sysOrder.getOrderId() + "不生成食谱------------------------");
|
||||
continue;
|
||||
}
|
||||
@ -208,6 +211,21 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
|
||||
}
|
||||
}
|
||||
|
||||
//定金单或尾款单是否需要生成食谱计划,2021-01-12修改为6月11日之后成交的订单只生成定金单计划
|
||||
private boolean isNeedByOrderMoneyType(SysOrder sysOrder){
|
||||
if("0".equals(sysOrder.getOrderMoneyType())){
|
||||
return true;
|
||||
}else{
|
||||
//成交时间
|
||||
LocalDate orderDate = DateUtils.dateToLocalDate(sysOrder.getOrderTime());
|
||||
if(ChronoUnit.DAYS.between(newVersionPlanStartDate, orderDate) >= 0){
|
||||
return "1".equals(sysOrder.getOrderMoneyType());
|
||||
}else{
|
||||
return "2".equals(sysOrder.getOrderMoneyType());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询食谱计划中对应食谱存在天数缺失的食谱计划,食谱计划发生变化时,可能会导致sys_customer_daily_menu表中天数缺失,需要查询出来进行补充
|
||||
* @param cusId 客户ID
|
||||
|
@ -2,6 +2,8 @@ package com.stdiet.custom.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.stdiet.common.utils.DateUtils;
|
||||
import com.stdiet.custom.dto.response.VideoClassifyResponse;
|
||||
import com.stdiet.custom.mapper.SysNutritionalVideoMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.stdiet.custom.mapper.SysVideoClassifyMapper;
|
||||
@ -20,6 +22,9 @@ public class SysVideoClassifyServiceImpl implements ISysVideoClassifyService
|
||||
@Autowired
|
||||
private SysVideoClassifyMapper sysVideoClassifyMapper;
|
||||
|
||||
@Autowired
|
||||
private SysNutritionalVideoMapper sysNutritionalVideoMapper;
|
||||
|
||||
/**
|
||||
* 查询视频分类
|
||||
*
|
||||
@ -94,12 +99,28 @@ public class SysVideoClassifyServiceImpl implements ISysVideoClassifyService
|
||||
return sysVideoClassifyMapper.deleteSysVideoClassifyById(id);
|
||||
}
|
||||
|
||||
private boolean delChildrenClassify(Long id){
|
||||
//判断分类下是否存在视频,存在视频不能删除
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有类别
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<SysVideoClassify> getAllClassify(){
|
||||
return sysVideoClassifyMapper.getAllClassify();
|
||||
public List<SysVideoClassify> getAllClassify(SysVideoClassify sysVideoClassify){
|
||||
return sysVideoClassifyMapper.getAllClassify(sysVideoClassify);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按分类层级分类,返回视频目录列表
|
||||
*
|
||||
* @param sysVideoClassify 视频分类
|
||||
* @return 视频分类集合
|
||||
*/
|
||||
public List<SysVideoClassify> getAllClassifyAndVideo(Long parentId){
|
||||
return sysVideoClassifyMapper.getOneAllClassifyAndVideo(parentId);
|
||||
}
|
||||
}
|
@ -7,6 +7,8 @@
|
||||
<resultMap type="SysVideoClassify" id="SysVideoClassifyResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="cateName" column="cate_name" />
|
||||
<result property="parentId" column="parent_id" />
|
||||
<result property="orderNum" column="order_num" />
|
||||
<result property="payFlag" column="pay_flag" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="createBy" column="create_by" />
|
||||
@ -16,12 +18,16 @@
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSysVideoClassifyVo">
|
||||
select id, cate_name, pay_flag, create_time, create_by, update_time, update_by, del_flag from sys_video_classify
|
||||
select id, cate_name, parent_id, order_num, pay_flag, create_time, create_by, update_time, update_by, del_flag from sys_video_classify
|
||||
</sql>
|
||||
|
||||
<select id="selectSysVideoClassifyList" parameterType="SysVideoClassify" resultMap="SysVideoClassifyResult">
|
||||
<include refid="selectSysVideoClassifyVo"/>
|
||||
select id, cate_name, parent_id, order_num, pay_flag, create_time from sys_video_classify
|
||||
where del_flag = 0
|
||||
<if test="parentId != null">
|
||||
and parent_id = #{parentId}
|
||||
</if>
|
||||
order by order_num asc,id asc
|
||||
</select>
|
||||
|
||||
<select id="selectSysVideoClassifyById" parameterType="Long" resultMap="SysVideoClassifyResult">
|
||||
@ -34,6 +40,8 @@
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="cateName != null">cate_name,</if>
|
||||
<if test="parentId != null">parent_id,</if>
|
||||
<if test="orderNum != null">order_num,</if>
|
||||
<if test="payFlag != null">pay_flag,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
@ -44,6 +52,8 @@
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="cateName != null">#{cateName},</if>
|
||||
<if test="parentId != null">#{parentId},</if>
|
||||
<if test="orderNum != null">#{orderNum},</if>
|
||||
<if test="payFlag != null">#{payFlag},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
@ -57,6 +67,8 @@
|
||||
update sys_video_classify
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="cateName != null">cate_name = #{cateName},</if>
|
||||
<if test="parentId != null">parent_id = #{parentId},</if>
|
||||
<if test="orderNum != null">order_num = #{orderNum},</if>
|
||||
<if test="payFlag != null">pay_flag = #{payFlag},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
@ -78,8 +90,62 @@
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<select id="getAllClassify" resultMap="SysVideoClassifyResult">
|
||||
select id,cate_name from sys_video_classify where del_flag = 0
|
||||
<select id="getAllClassify" resultMap="SysVideoClassifyResult" parameterType="SysVideoClassify">
|
||||
select id, cate_name, parent_id, order_num, pay_flag, create_time, create_by, update_time, update_by, del_flag from sys_video_classify
|
||||
where del_flag = 0
|
||||
<if test="parentId != null">
|
||||
and parent_id = #{parentId}
|
||||
</if>
|
||||
order by order_num asc,id asc
|
||||
</select>
|
||||
|
||||
<resultMap type="SysVideoClassify" id="VideoClassifyOneResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="cateName" column="cate_name" />
|
||||
<!-- 查询子分类 -->
|
||||
<!--<association property="childrenClassify" column="id" select="getTwoAllClassifyAndVideo"/>-->
|
||||
<!-- 查询子视频 -->
|
||||
<!--<association property="childrenVideo" column="id" select="getAllVideoByClassify"/>-->
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="SysVideoClassify" id="VideoClassifyTwoResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="cateName" column="cate_name" />
|
||||
<!-- 查询子分类 -->
|
||||
<!--<association property="childrenClassify" column="id" select="getThreeAllClassifyAndVideo"/>-->
|
||||
<!-- 查询子视频 -->
|
||||
<!--<association property="childrenVideo" column="id" select="getAllVideoByClassify"/>-->
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="com.stdiet.custom.dto.response.VideoClassifyThreeResponse" id="VideoClassifyThreeResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="cateName" column="cate_name" />
|
||||
<!-- 查询子视频 -->
|
||||
<association property="childrenVideo" column="id" select="getAllVideoByClassify"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="getOneAllClassifyAndVideo" resultMap="VideoClassifyOneResult" parameterType="SysVideoClassify">
|
||||
select id, cate_name from sys_video_classify
|
||||
left join sys_video_classify
|
||||
where del_flag = 0 and parent_id = #{parentId}
|
||||
order by order_num asc,id asc
|
||||
</select>
|
||||
|
||||
<select id="getTwoAllClassifyAndVideo" resultMap="VideoClassifyTwoResult" parameterType="Long">
|
||||
select id, cate_name from sys_video_classify
|
||||
where del_flag = 0 and parent_id = #{id}
|
||||
order by order_num asc,id asc
|
||||
</select>
|
||||
|
||||
<select id="getThreeAllClassifyAndVideo" resultMap="VideoClassifyThreeResult" parameterType="Long">
|
||||
select id, cate_name from sys_video_classify
|
||||
where del_flag = 0 and parent_id = #{id}
|
||||
order by order_num asc,id asc
|
||||
</select>
|
||||
|
||||
<select id="getAllVideoByClassify" resultType="Map" parameterType="Long">
|
||||
select snv.video_id as videoId, snv.cover_url as coverUrl, snv.title, snv.description
|
||||
from sys_nutritional_video snv where cate_id = #{id} and del_flag = 0 and show_flag = 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
Reference in New Issue
Block a user