瀏覽代碼

fix

photo
winter 1 年之前
父節點
當前提交
60ed7d7888
共有 2 個文件被更改,包括 33 次插入29 次删除
  1. +2
    -0
      suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java
  2. +31
    -29
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java

+ 2
- 0
suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java 查看文件

@@ -4,6 +4,7 @@ import com.iformall.annotation.AuthIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity.SortField;
import com.iformall.enums.*;
import com.iformall.service.*;
import com.iformall.service.pay.PayServiceFactory;
@@ -221,6 +222,7 @@ public class ProductOrderController extends BaseController {
po.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
po.setProjectType(projectType);
po.setUserId(getMemberId());
po.setSortColumns(SortField.CreateDate_DESC);
return new ResultData(productOrderService.listAsPage(po, pageNum, pageSize));
}



+ 31
- 29
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java 查看文件

@@ -480,37 +480,39 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
this.saveOrUpdate(videoUpd);

//实时判断上传状态
for (int i = 0;i <= 30; i++){
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
// for (int i = 0;i <= 30; i++){
// try {
// Thread.sleep(1000);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId());
if (progress.equals("complete")) {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true);
if (videoDetail.isSuccess()){
videoUpd = new UserMouldVideo();
videoUpd.setId(userMouldVideo.getId());
videoUpd.setCoverImg(videoDetail.getCoverURL());
videoUpd.setVideoPlayUrl(videoDetail.getVideoUrl());
videoUpd.setVideoTime(videoDetail.getDuration());
videoUpd.setVideoSize(videoDetail.getSize());
videoUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode());
videoUpd.setVideoMsg("视频上传成功");
videoUpd.setUpdateDate(new Date());
//设置扣费,当前方法是慧影项目专用的
CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode())
.handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize());
if (null != cb) {
logger.info("createBilling result:"+JSON.toJSONString(cb));
videoUpd.setCostPoints(cb.getTotalCostPoins());
videoUpd.setCostPointsDetail(cb.getDetail());
}
this.updateById(videoUpd);
break;
}
while(true) {
if (progress.equals("complete")) {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true);
if (videoDetail.isSuccess()){
videoUpd = new UserMouldVideo();
videoUpd.setId(userMouldVideo.getId());
videoUpd.setCoverImg(videoDetail.getCoverURL());
videoUpd.setVideoPlayUrl(videoDetail.getVideoUrl());
videoUpd.setVideoTime(videoDetail.getDuration());
videoUpd.setVideoSize(videoDetail.getSize());
videoUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode());
videoUpd.setVideoMsg("视频上传成功");
videoUpd.setUpdateDate(new Date());
//设置扣费,当前方法是慧影项目专用的
CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode())
.handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize());
if (null != cb) {
logger.info("createBilling result:"+JSON.toJSONString(cb));
videoUpd.setCostPoints(cb.getTotalCostPoins());
videoUpd.setCostPointsDetail(cb.getDetail());
}
this.updateById(videoUpd);
break;
}
}
// }
}
}
}


Loading…
取消
儲存