2

src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java

@@ -71,7 +71,7 @@ public class AppGoodsController {
     @GetMapping("/getTaskStatus/")
     public ApiResponse<VideoTaskStatusVO> getAllTaskStatus() {
         JwtInfo worker = JwtTokenUtil.getWorker();
-        return goodsService.getAllTaskStatus(worker.getUserId());
+        return ApiResponse.success(goodsService.getAllTaskStatus(worker.getUserId()));
     }
 
     /**
@@ -84,6 +84,6 @@ public class AppGoodsController {
     @GetMapping("/task/face/{faceId}/template/{templateId}")
     public ApiResponse<VideoTaskStatusVO> getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) {
         JwtInfo worker = JwtTokenUtil.getWorker();
-        return goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId);
+        return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId));
     }
 }

src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java

@@ -29,13 +29,15 @@ public class AppTaskController {
     @IgnoreLogReq
     public ApiResponse<VideoTaskStatusVO> getTaskStatusByFaceId(@PathVariable("faceId") Long faceId) {
         JwtInfo worker = JwtTokenUtil.getWorker();
-        return goodsService.getTaskStatusByFaceId(worker.getUserId(), faceId);
+        return ApiResponse.success(goodsService.getTaskStatusByFaceId(worker.getUserId(), faceId));
     }
     @GetMapping("/scenic/{scenicId}")
     @IgnoreLogReq
     public ApiResponse<VideoTaskStatusVO> getAllTaskStatusByScenicId(@PathVariable("scenicId") Long scenicId) {
         JwtInfo worker = JwtTokenUtil.getWorker();
-        return goodsService.getTaskStatusByScenicId(worker.getUserId(), scenicId);
+        VideoTaskStatusVO taskStatus = goodsService.getTaskStatusByScenicId(worker.getUserId(), scenicId);
+        taskStatus.setScenicId(scenicId);
+        return ApiResponse.success(taskStatus);
     }
 
     /**
@@ -49,7 +51,7 @@ public class AppTaskController {
     @IgnoreLogReq
     public ApiResponse<VideoTaskStatusVO> getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) {
         JwtInfo worker = JwtTokenUtil.getWorker();
-        return goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId);
+        return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId));
     }
 
     @PostMapping("/submit")

src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicOrderController.java

@@ -0,0 +1,38 @@
+package com.ycwl.basic.controller.mobile.manage;
+
+import com.ycwl.basic.constant.BaseContextHandler;
+import com.ycwl.basic.mapper.ScenicAccountMapper;
+import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
+import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
+import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
+import com.ycwl.basic.service.pc.OrderService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/mobile/scenic/order/v1")
+@Api(tags = "景区账号相关接口")
+public class AppScenicOrderController {
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private ScenicAccountMapper scenicAccountMapper;
+
+    @PostMapping("/list")
+    public ApiResponse<List<OrderRespVO>> list(@RequestBody OrderReqQuery query) {
+        String userId = BaseContextHandler.getUserId();
+        ScenicAccountEntity account = scenicAccountMapper.findAccountById(userId);
+        if (account == null) {
+            return ApiResponse.fail("用户未绑定景区");
+        }
+        query.setScenicId(account.getScenicId());
+        return orderService.list(query);
+    }
+}

src/main/java/com/ycwl/basic/controller/mobile/manage/AppStatisticsController.java

@@ -64,6 +64,7 @@ public class AppStatisticsController {
 
     @ApiOperation("统计数据记录")
     @PostMapping("/addStatistics")
+    @IgnoreToken
     public ApiResponse addStatistics(@RequestBody StatisticsRecordAddReq req) {
 
         return statisticsService.addStatistics(req);