Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

视频分类修改

Browse Source
This commit is contained in:
xiezhijun
2021-06-12 18:34:32 +08:00
parent ffe1c18202
commit 6a7c6a72ac
18 changed files with 480 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysVideoClassify.java
View File

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

55
stdiet-custom/src/main/java/com/stdiet/custom/dto/response/VideoClassifyResponse.java Normal file
View File

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

45
stdiet-custom/src/main/java/com/stdiet/custom/dto/response/VideoClassifyThreeResponse.java Normal file
View File

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

56
stdiet-custom/src/main/java/com/stdiet/custom/dto/response/VideoClassifyTwoResponse.java Normal file
View File

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

10
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysVideoClassifyMapper.java
View File

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

1
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysNutritionalVideoService.java
View File

@ -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;
/**

10
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysVideoClassifyService.java
View File

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

17
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -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对象设置服务到期时间
*

20
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -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

25
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysVideoClassifyServiceImpl.java
View File

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