视频接口优化,案例检索

This commit is contained in:
xiezhijun
2021-05-08 19:09:32 +08:00
parent d474e823c3
commit 8600f48740
26 changed files with 396 additions and 71 deletions

View File

@ -54,4 +54,7 @@ public class SysCustomerCase extends BaseEntity
//案例文件URL数组
private String[] caseFileUrl;
//病史体征ID集合非持久化字段
private List<Long> signIdList;
}

View File

@ -61,7 +61,7 @@ public class SysNutritionalVideo extends BaseEntity
/** 视频付费等级0无需付费 1客户可看 2付费可看 */
@Excel(name = "视频付费等级0无需付费 1客户可看 2付费可看")
private Long payLevel;
private Integer payLevel;
private String payLevelName;
@ -72,6 +72,8 @@ public class SysNutritionalVideo extends BaseEntity
/** 删除标识0未删除 1已删除默认0 */
private Integer delFlag;
private String playUrl;
//文件名称
private String fileName;
@ -79,4 +81,9 @@ public class SysNutritionalVideo extends BaseEntity
//排序方式 1 按照创建时间倒序 2按照优先级、时间倒序
private Integer sortType;
private String openId;
//微信用户类型 0 普通用户 1 已下单客户
private Integer userType;
}

View File

@ -19,34 +19,45 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
/**订单ID*/
@Excel(name = "订单ID")
private Long orderId;
/**订单成交时间*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "订单成交时间")
private LocalDateTime orderTime;
/**客户姓名*/
@Excel(name = "客户姓名")
private String name;
/**服务结束时间*/
/**订单金额或服务订单金额*/
@Excel(name = "订单金额")
private BigDecimal orderAmount;
/**服务开始时间*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "服务开始时间")
private LocalDate serverStartDate;
/**服务结束时间*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "服务结束时间")
private LocalDate serverEndDate;
/**服务月数*/
private Integer serverMonth;
/**服务天数*/
@Excel(name = "服务天数")
private Integer serverDay;
/**赠送天数*/
private Integer giveDay;
/**订单金额或服务订单金额*/
private BigDecimal orderAmount;
/** 暂停总天数 **/
/**订单总提成**/
private BigDecimal orderCommission;
private int pauseTotalDay;
//已发放提成
private BigDecimal hasSendOrderCommission;
@ -54,15 +65,10 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
//未发放提成
private BigDecimal notHasSendOrderCommission;
/**服务天数*/
private Integer serverDay;
/**每天金额*/
@Excel(name = "每天金额")
private BigDecimal dayMoney;
/** 暂停总天数 **/
private int pauseTotalDay;
/**每年每月暂停天数*/
private Map<String, Integer> everyYearMonthPauseDay;
@ -79,11 +85,17 @@ public class SysOrderCommisionDayDetail extends BaseEntity {
private Map<String, Boolean> everyYearMonthCommissionSendFlag;
//该笔订单成交的当月的总成交额,用于确定提成比例
@Excel(name = "当月的成交额")
private BigDecimal monthOrderTotalAmount;
//该笔订单对应提成比例
@Excel(name = "提成比例")
private Float commissionRate;
/**订单总提成**/
@Excel(name = "订单提成")
private BigDecimal orderCommission;
//售后
private Long afterSaleId;