From 60ed7d78885e1e3322d794fc2356a9a30d3c466f Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 1 Dec 2023 16:53:13 +0800 Subject: [PATCH] fix --- .../controller/ProductOrderController.java | 2 + .../sm/impl/UserMouldVideoServiceImpl.java | 60 ++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java b/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java index 30ca79f..1968d31 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java +++ b/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)); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index ac5efc5..09eabbb 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/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; + } } +// } } } }