ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit fb6afb64bc4d2d18018d55eebfce0c1b1f7dcabc 1 parent 931f0f86

转码

Inline Side-by-side
Showing 3 changed files with 10 additions and 6 deletions
... ... @@ -52,7 +52,10 @@
<artifactId>poi-ooxml</artifactId>
<version>3.16</version>
</dependency>
<dependency>
<groupId>com.yoho.ufo.model</groupId>
<artifactId>order-ufo-model</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
... ...
... ... @@ -2,6 +2,7 @@ package com.yoho.ufo.service.impl;
import javax.annotation.PostConstruct;
import com.yohobuy.ufo.model.order.constants.QNliveConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
... ... @@ -51,7 +52,7 @@ public class QNliveUtil {
//设置转码的队列
private static String PIPELINE = "yoho-m3u8-to-mp4";
public static final String LIVE_VEDIO_DOMAIN = "http://flv01.static.yhbimg.com/";
public static final String LIVE_VEDIO_DOMAIN = QNliveConstants.LIVE_VIDEO_DOMAIN;
private Auth auth;
... ...
... ... @@ -294,9 +294,9 @@ function getToBeJudgedList(){
} else if (rowData.status == 3) {
var operateButton = "<a role='pass' dataId='"+ rowData.id + "'" + " orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>鉴定通过</a>"+
"<a role='reject' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #d9534f !important;'>鉴定不通过</a>"+
"<a role='record' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>录制视频</a>";
"<a role='record' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5bc0de !important;'>录制视频</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='query' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>查看视频</a>";
operateButton += "<a role='query' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFFF00 !important;'>查看视频</a>";
}
return operateButton;
} else if (rowData.status == 17) {
... ... @@ -490,13 +490,13 @@ function getAlreadyJudgedList(){
operateButton += "<a role='buyerReceiveInfo' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>买家收货地址</a>" +
"<a role='viewExpress' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>查看视频</a>";
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFFF00 !important;'>查看视频</a>";
}
} else if (rowData.status == 13) {//鉴定不通过
operateButton += "<a role='rebackAddress' dataId='"+ rowData.orderCode +"' skup='"+ rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>商品寄回地址</a>"+
"<a role='viewExpress' dataId='"+ rowData.orderCode + "' style='margin-left:10px;background-color: #5cb85c !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>查看视频</a>";
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFFF00 !important;'>查看视频</a>";
}
}
return operateButton;
... ...