diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
index 7bb43543c..42095ecee 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
@@ -58,8 +58,8 @@ public class TtCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="",name="videoId")
private String videoId;
- @io.swagger.annotations.ApiModelProperty(value="视频时长(分钟)",name="videoTime")
- private Integer videoTime;
+ @io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime")
+ private String videoTime;
@io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html")
private String html;
@@ -117,9 +117,11 @@ public class TtCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="作者",name="merchantId")
private Long merchantId;
- @io.swagger.annotations.ApiModelProperty(value="",name="merchantName")//弃用
+ @TableField(exist = false)
+ @io.swagger.annotations.ApiModelProperty(value="",name="merchantName")
private String merchantName;
- @io.swagger.annotations.ApiModelProperty(value="",name="merchantPic")//弃用
+ @TableField(exist = false)
+ @io.swagger.annotations.ApiModelProperty(value="",name="merchantPic")
private String merchantPic;
@io.swagger.annotations.ApiModelProperty(value="业态",name="businessId")
diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
index f59e9e4bd..7f0484a02 100644
--- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
@@ -12,7 +12,7 @@
-
+
@@ -36,10 +36,10 @@
-
-
+
+
@@ -48,7 +48,7 @@
`sale_price`, `orig_price`, `is_preview`, `preview_duration`, `detail`, `false_sell_count`,
`dy_title`, `inventory`, `remark`, `status`, `create_date`, `update_date`,
`see_count`, `sell_count`, `assess_count`, `collect_count`, `is_del`,
- `column_id`, `popularity`, `merchant_id`, `merchant_name`,`merchant_pic`, `business_id`, `business_name`
+ `column_id`, `popularity`, `merchant_id`, `business_id`, `business_name`
diff --git a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
index 7764495fe..97728a180 100644
--- a/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
+++ b/mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java
@@ -89,6 +89,7 @@ public class AliyunVideoExcutor implements VideoExcutor {
UploadStreamResponse response;
try {
response = AliyunVedioUpload.uploadStream(config.getAccessKeyId(), config.getAccessKeySecret(),config.getRegionId(), title, UUID.randomUUID().toString().replace("-","")+fileFormat, inputStream,redisTemplate);
+ log.info(response.toString());
if (response.isSuccess()) {
result.setVideoId(response.getVideoId());
result.setVideoUrl(getUrlByVeidoId(response.getVideoId()));