添加“单模版成片任务查询”接口

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<Integer> getTaskStatus(@PathVariable("scenicId") Long scenicId) {
+    public ApiResponse<Integer> 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<Integer> getTemplateTaskStatus(@PathVariable("templateId") Long templateId) {
+        JwtInfo worker = JwtTokenUtil.getWorker();
+        return goodsService.getTemplateTaskStatus(worker.getUserId(),templateId);
+    }
+
+
 }

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;

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<OrderItemVO> orderItemList;
 }

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<Integer> getTaskStatus(Long userId, Long scenicId) {
+    public ApiResponse<Integer> 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<Integer> 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);
+        }
+    }
+
 }

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);
     }

src/main/java/com/ycwl/basic/service/mobile/GoodsService.java

@@ -49,5 +49,7 @@ public interface GoodsService {
      * @param userId
      * @return
      */
-    ApiResponse<Integer> getTaskStatus(Long userId ,Long scenicId);
+    ApiResponse<Integer> getAllTaskStatus(Long userId ,Long scenicId);
+
+    ApiResponse<Integer> getTemplateTaskStatus(Long userId, Long templateId);
 }