From 3c502c600c8711f029e0ec35050896c421c75b82 Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Wed, 11 Dec 2024 09:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E6=88=90=E7=89=87=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E2=80=9D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/AppGoodsController.java | 20 ++++++++++++++++--- .../model/pc/order/req/OrderReqQuery.java | 2 +- .../model/pc/order/resp/OrderAppRespVO.java | 2 ++ .../service/impl/mobile/GoodsServiceImpl.java | 16 ++++++++++++++- .../service/impl/pc/OrderServiceImpl.java | 1 + .../basic/service/mobile/GoodsService.java | 4 +++- 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java index 0ae16c2..1a4ba27 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java @@ -59,10 +59,24 @@ public class AppGoodsController { * @param scenicId 景区id * @return 1 合成中 2 合成成功 */ - @ApiOperation("查询用户当前景区的视频合成任务状态 1 合成中 2 合成成功 ") + @ApiOperation("查询用户当前景区的整体视频合成任务状态 1 合成中 2 合成成功 ") @GetMapping("/getTaskStatus/{scenicId}") - public ApiResponse getTaskStatus(@PathVariable("scenicId") Long scenicId) { + public ApiResponse getAllTaskStatus(@PathVariable("scenicId") Long scenicId) { JwtInfo worker = JwtTokenUtil.getWorker(); - return goodsService.getTaskStatus(worker.getUserId(),scenicId); + return goodsService.getAllTaskStatus(worker.getUserId(),scenicId); } + + /** + * 查询用户当前景区的具体模版视频合成任务状态 + * @param templateId 模版id + * @return 1 合成中 2 合成成功 + */ + @ApiOperation("查询用户当前景区的具体模版视频合成任务状态 1 合成中 2 合成成功 ") + @GetMapping("/getTemplateTaskStatus/{templateId}") + public ApiResponse getTemplateTaskStatus(@PathVariable("templateId") Long templateId) { + JwtInfo worker = JwtTokenUtil.getWorker(); + return goodsService.getTemplateTaskStatus(worker.getUserId(),templateId); + } + + } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java index 78568ed..55940f4 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @ApiModel(value = "订单查询对象") public class OrderReqQuery extends BaseQueryParameterReq { -// private Long id; + private Long id; private Long memberId; @ApiModelProperty("用户昵称") private String memberNickname; diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java index 8f12d25..321b968 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java @@ -90,6 +90,8 @@ public class OrderAppRespVO { private Integer goodsType; @ApiModelProperty("封面图片（来自模版封面图片）") private String coverUrl; + @ApiModelProperty("原素材类型：1视频，2图像") + private Integer sourceType; @ApiModelProperty("订单明细") private List orderItemList; } diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java index 3f5bbac..2313e19 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java @@ -193,7 +193,7 @@ public class GoodsServiceImpl implements GoodsService { * @return 1 合成中 2 合成成功 */ @Override - public ApiResponse getTaskStatus(Long userId, Long scenicId) { + public ApiResponse getAllTaskStatus(Long userId, Long scenicId) { TaskReqQuery taskReqQuery = new TaskReqQuery(); taskReqQuery.setMemberId(userId); taskReqQuery.setScenicId(scenicId); @@ -206,4 +206,18 @@ public class GoodsServiceImpl implements GoodsService { } } + @Override + public ApiResponse getTemplateTaskStatus(Long userId, Long templateId) { + TaskReqQuery taskReqQuery = new TaskReqQuery(); + taskReqQuery.setMemberId(userId); + taskReqQuery.setScenicId(templateId); + taskReqQuery.setStatus(2); + int count=taskMapper.countTask(taskReqQuery); + if(count>0){ + return ApiResponse.success(1); + }else { + return ApiResponse.success(2); + } + } + } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java index 191492c..a6f4c2b 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java @@ -278,6 +278,7 @@ public class OrderServiceImpl implements OrderService { OrderItemVO itemVO = orderItemList.get(NumberConstant.ZERO); orderAppRespVO.setScenicName(itemVO.getScenicName()); orderAppRespVO.setGoodsName(itemVO.getGoodsName()); + orderAppRespVO.setSourceType(itemVO.getSourceType()); } return ApiResponse.success(orderAppRespVO); } diff --git a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java index 8202f84..b2b85b5 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java @@ -49,5 +49,7 @@ public interface GoodsService { * @param userId * @return */ - ApiResponse getTaskStatus(Long userId ,Long scenicId); + ApiResponse getAllTaskStatus(Long userId ,Long scenicId); + + ApiResponse getTemplateTaskStatus(Long userId, Long templateId); }