From 41aba63e5d629f166f7c14e16f23e9c2a0d6dffd Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 14 Mar 2025 16:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extern/LyCompatibleController.java | 2 +- .../controller/mobile/AppGoodsController.java | 11 +--- .../controller/mobile/AppIndexController.java | 54 ------------------- .../mobile/AppMemberController.java | 20 ------- .../controller/mobile/AppOrderController.java | 4 -- .../mobile/AppScenicController.java | 16 +----- .../controller/mobile/AppTaskController.java | 5 +- .../com/ycwl/basic/mapper/MemberMapper.java | 1 - .../com/ycwl/basic/mapper/VideoMapper.java | 2 +- .../model/pc/member/resp/MemberRespVO.java | 1 + .../impl/mobile/AppScenicServiceImpl.java | 15 ++---- .../service/impl/mobile/GoodsServiceImpl.java | 15 +++--- .../service/mobile/AppScenicService.java | 12 +---- .../basic/service/mobile/GoodsService.java | 6 +-- .../task/impl/TaskTaskServiceImpl.java | 2 +- src/main/resources/mapper/MemberMapper.xml | 6 +-- src/main/resources/mapper/VideoMapper.xml | 2 +- 17 files changed, 31 insertions(+), 143 deletions(-) delete mode 100644 src/main/java/com/ycwl/basic/controller/mobile/AppIndexController.java diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java index ce0265e..79ab8a2 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java @@ -197,7 +197,7 @@ public class LyCompatibleController { return R.error("用户没有上传过照片！"); } VideoTaskStatusVO taskStatusVO = goodsService.getTaskStatusByScenicId(member.getId(), member.getScenicId()); - List listApiResponse = appScenicService.faceContentList(member.getId(), faceVO.getId()); + List listApiResponse = appScenicService.faceContentList(faceVO.getId()); Map> collect = listApiResponse.stream() .filter(contentPageVO -> contentPageVO.getLockType() < 0) .collect(Collectors.groupingBy(ContentPageVO::getGoodsType)); 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 3ebd485..9b0ecb2 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java @@ -1,13 +1,11 @@ package com.ycwl.basic.controller.mobile; import com.ycwl.basic.annotation.IgnoreToken; -import com.ycwl.basic.biz.TaskStatusBiz; import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.exception.CheckTokenException; import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.goods.*; import com.ycwl.basic.service.mobile.GoodsService; -import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; import io.swagger.annotations.Api; @@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; import java.util.List; /** @@ -30,10 +27,6 @@ public class AppGoodsController { @Autowired private GoodsService goodsService; - @Autowired - private TaskService taskService; - @Autowired - private TaskStatusBiz taskStatusBiz; @ApiOperation("商品列表") @PostMapping("/goodsList") @@ -63,7 +56,7 @@ public class AppGoodsController { @GetMapping("/sourceGoods/{sourceId}") public ApiResponse sourceGoodsInfo(@PathVariable("sourceId") Long sourceId) { JwtInfo worker = JwtTokenUtil.getWorker(); - return goodsService.sourceGoodsInfo(worker.getUserId(), sourceId); + return goodsService.sourceGoodsInfo(sourceId); } /** @@ -88,6 +81,6 @@ public class AppGoodsController { @GetMapping("/task/face/{faceId}/template/{templateId}") public ApiResponse getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) { JwtInfo worker = JwtTokenUtil.getWorker(); - return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId)); + return ApiResponse.success(goodsService.getTaskStatusByTemplateId(faceId, templateId)); } } diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppIndexController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppIndexController.java deleted file mode 100644 index 16fd105..0000000 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppIndexController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.ycwl.basic.controller.mobile; - -import com.ycwl.basic.annotation.IgnoreToken; -import com.ycwl.basic.model.mobile.index.TopStateResp; -import com.ycwl.basic.model.mobile.scenic.ScenicAppVO; -import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO; -import com.ycwl.basic.service.mobile.AppScenicService; -import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Author：longbinbin - * @Date：2024/12/5 10:20 - */ -@RestController -@RequestMapping("/api/mobile/index/v1") -@Api(tags = "首页相关接口") -public class AppIndexController { - - @Autowired - private AppScenicService scenicService; - - /** - * 首页景区列表 - * - * @return - */ -// @ApiOperation(value = "首页景区列表", notes = "首页景区列表") -// @PostMapping("/scenicList") -// @IgnoreToken -// public ApiResponse> scenicList(@RequestBody ScenicIndexVO scenicIndexVO) { -// return scenicService.scenicList(scenicIndexVO); -// } - -// @ApiOperation(value = "顶部状态", notes = "顶部状态") -// @GetMapping("/topState") -// @IgnoreToken -// public ApiResponse topState() { -// return scenicService.topState(); -// } - - @GetMapping("/faceAgreement") - public ApiResponse faceAgreement() { - return ApiResponse.success("人脸识别隐私协议：\n" + - "1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n" + - "1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n" + - "1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n1、xxx\n"); - } -} diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java index e006d09..8dabdd3 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java @@ -62,26 +62,6 @@ public class AppMemberController { return memberService.update(userInfoUpdateDTO); } - /** - * 同意用户协议 - * - * @return - */ - @ApiOperation("同意用户协议") - @GetMapping("/agreement") - public ApiResponse agreement() { - return memberService.agreement(); - } - - - @ApiOperation("是否首次获取视频") - @GetMapping("/isFirstObtainVideo") - public ApiResponse isFirstTimeObtainingVideo() { - // TODO 判断是否首次获取视频逻辑 - - return ApiResponse.success(""); - } - @ApiOperation("新增或修改景区服务通知状态") @GetMapping("/updateScenicServiceNoticeStatus") public ApiResponse updateScenicServiceNoticeStatus(Long scenicId) { diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java index 114d7e7..4ff4401 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java @@ -38,13 +38,9 @@ public class AppOrderController { @Autowired private OrderService orderService; @Autowired - private OrderRepository orderRepository; - @Autowired private OrderBiz orderBiz; @Autowired private PriceBiz priceBiz; - @Autowired - private PriceRepository priceRepository; @ApiOperation("用户端订单列表查询") @PostMapping("/page") diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index 5590392..d3c9160 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -2,10 +2,7 @@ package com.ycwl.basic.controller.mobile; import com.github.pagehelper.PageInfo; import com.ycwl.basic.annotation.IgnoreToken; -import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.model.jwt.JwtInfo; -import com.ycwl.basic.model.mobile.goods.GoodsPageVO; -import com.ycwl.basic.model.mobile.goods.GoodsReqQuery; import com.ycwl.basic.model.mobile.scenic.ScenicAppVO; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; @@ -14,7 +11,6 @@ import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.service.mobile.AppScenicService; -import com.ycwl.basic.service.pc.ScenicService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; import io.swagger.annotations.Api; @@ -74,16 +70,8 @@ public class AppScenicController { @ApiOperation("景区视频源素材列表") @GetMapping("/face/{faceId}/contentList") - public ApiResponse> contentList(@PathVariable String faceId) { - if (!StringUtils.isNumeric(faceId)) { - log.error("请求异常, faceId: [{}]",faceId); - return ApiResponse.fail("请求异常"); - } - Long id = Long.parseLong(faceId); - JwtInfo worker = JwtTokenUtil.getWorker(); - List contentPageVOS = appScenicService.faceContentList(worker.getUserId(), id); + public ApiResponse> contentList(@PathVariable Long faceId) { + List contentPageVOS = appScenicService.faceContentList(faceId); return ApiResponse.success(contentPageVOS); } - - } diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java index 6a6b2e1..3174d1f 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java @@ -1,7 +1,6 @@ package com.ycwl.basic.controller.mobile; import com.ycwl.basic.annotation.IgnoreLogReq; -import com.ycwl.basic.biz.TaskStatusBiz; import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.goods.VideoTaskReq; import com.ycwl.basic.model.mobile.goods.VideoTaskStatusVO; @@ -30,7 +29,7 @@ public class AppTaskController { @IgnoreLogReq public ApiResponse getTaskStatusByFaceId(@PathVariable("faceId") Long faceId) { JwtInfo worker = JwtTokenUtil.getWorker(); - return ApiResponse.success(goodsService.getTaskStatusByFaceId(worker.getUserId(), faceId)); + return ApiResponse.success(goodsService.getTaskStatusByFaceId(faceId)); } @GetMapping("/scenic/{scenicId}") @IgnoreLogReq @@ -52,7 +51,7 @@ public class AppTaskController { @IgnoreLogReq public ApiResponse getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) { JwtInfo worker = JwtTokenUtil.getWorker(); - return ApiResponse.success(goodsService.getTaskStatusByTemplateId(worker.getUserId(), faceId, templateId)); + return ApiResponse.success(goodsService.getTaskStatusByTemplateId(faceId, templateId)); } @PostMapping("/submit") diff --git a/src/main/java/com/ycwl/basic/mapper/MemberMapper.java b/src/main/java/com/ycwl/basic/mapper/MemberMapper.java index 1a2de5c..36a377a 100644 --- a/src/main/java/com/ycwl/basic/mapper/MemberMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/MemberMapper.java @@ -3,7 +3,6 @@ package com.ycwl.basic.mapper; import com.ycwl.basic.model.pc.member.entity.MemberEntity; import com.ycwl.basic.model.pc.member.req.MemberReqQuery; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; -import com.ycwl.basic.utils.ApiResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/ycwl/basic/mapper/VideoMapper.java b/src/main/java/com/ycwl/basic/mapper/VideoMapper.java index cd96259..ae99e97 100644 --- a/src/main/java/com/ycwl/basic/mapper/VideoMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/VideoMapper.java @@ -39,7 +39,7 @@ public interface VideoMapper { MemberVideoEntity queryRelationByMemberTask(Long userId, Long taskId); List listRelationByTask(Long taskId); List listRelationByFace(Long userId, Long faceId); - List listRelationByFaceAndTemplate(Long userId, Long faceId, Long templateId); + List listRelationByFaceAndTemplate(Long faceId, Long templateId); List listTaskByScenicRelation(Long userId, Long scenicId); diff --git a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java index 3cff0d4..1ed3e47 100644 --- a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java @@ -14,6 +14,7 @@ import java.util.Date; @Data @ApiModel("查询用户信息响应参数") public class MemberRespVO { + private Long uid; private Long id; private Long scenicId; /** diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java index 79daf2d..e94288e 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java @@ -11,7 +11,6 @@ import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.order.IsBuyRespVO; import com.ycwl.basic.model.mobile.scenic.ScenicAppVO; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; -import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO; import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginReq; import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginRespVO; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; @@ -26,7 +25,6 @@ import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity; import com.ycwl.basic.model.pc.video.entity.VideoEntity; -import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.repository.VideoRepository; import com.ycwl.basic.repository.VideoTaskRepository; @@ -100,14 +98,9 @@ public class AppScenicServiceImpl implements AppScenicService { } @Override - public ApiResponse> scenicList(ScenicIndexVO scenicIndexVO) { - List dataList = scenicMapper.scenicListByLnLa(scenicIndexVO); - return ApiResponse.success(dataList); - } - - @Override - public List faceContentList(Long userId, Long faceId) { + public List faceContentList(Long faceId) { FaceRespVO faceRespVO = faceMapper.getById(faceId); + Long userId = faceRespVO.getMemberId(); if (faceRespVO == null) { return Collections.emptyList(); } @@ -188,9 +181,11 @@ public class AppScenicServiceImpl implements AppScenicService { } sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).forEach((type, list) -> { if (type == 1) { + sourceVideoContent.setSourceType(1); sourceVideoContent.setLockType(-1); sourceVideoContent.setTemplateCoverUrl(list.get(0).getUrl()); } else { + sourceImageContent.setSourceType(2); sourceImageContent.setLockType(-1); sourceImageContent.setTemplateCoverUrl(list.get(0).getUrl()); } @@ -229,7 +224,7 @@ public class AppScenicServiceImpl implements AppScenicService { @Override public ApiResponse> contentListUseDefaultFace() { FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(BaseContextHandler.getUserId()); - List contentPageVOS = faceContentList(lastFaceByUserId.getMemberId(), lastFaceByUserId.getId()); + List contentPageVOS = faceContentList(lastFaceByUserId.getId()); return ApiResponse.success(contentPageVOS); } 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 7857d99..0231abb 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 @@ -253,8 +253,9 @@ public class GoodsServiceImpl implements GoodsService { * @return 0没有任务 1 合成中 2 合成成功 */ @Override - public VideoTaskStatusVO getTaskStatusByFaceId(Long userId, Long faceId) { + public VideoTaskStatusVO getTaskStatusByFaceId(Long faceId) { FaceEntity face = faceRepository.getFace(faceId); + Long userId = face.getMemberId(); VideoTaskStatusVO response = new VideoTaskStatusVO(); response.setFaceId(faceId); if (face == null) { @@ -318,12 +319,12 @@ public class GoodsServiceImpl implements GoodsService { @Override public VideoTaskStatusVO getAllTaskStatus(Long userId) { FaceRespVO lastFaceByUserId = faceMapper.findLastFaceByUserId(String.valueOf(userId)); - return getTaskStatusByFaceId(userId, lastFaceByUserId.getId()); + return getTaskStatusByFaceId(lastFaceByUserId.getId()); } @Override - public VideoTaskStatusVO getTaskStatusByTemplateId(Long userId, Long faceId, Long templateId) { - List taskList = videoMapper.listRelationByFaceAndTemplate(userId, faceId, templateId); + public VideoTaskStatusVO getTaskStatusByTemplateId(Long faceId, Long templateId) { + List taskList = videoMapper.listRelationByFaceAndTemplate(faceId, templateId); VideoTaskStatusVO response = new VideoTaskStatusVO(); response.setFaceId(faceId); response.setTemplateId(templateId); @@ -397,12 +398,12 @@ public class GoodsServiceImpl implements GoodsService { response.setStatus(-2); return response; } - return getTaskStatusByFaceId(userId, faceVO.getId()); + return getTaskStatusByFaceId(faceVO.getId()); } @Override - public ApiResponse sourceGoodsInfo(Long userId, Long sourceId) { - SourceRespVO sourceRespVO = sourceMapper.listUserOne(userId, sourceId); + public ApiResponse sourceGoodsInfo(Long sourceId) { + SourceRespVO sourceRespVO = sourceMapper.getById(sourceId); if (sourceRespVO == null) { sourceRespVO = sourceMapper.getById(sourceId); if (sourceRespVO == null) { diff --git a/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java b/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java index 539dc4d..9f9bab5 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java @@ -3,7 +3,6 @@ package com.ycwl.basic.service.mobile; import com.github.pagehelper.PageInfo; import com.ycwl.basic.model.mobile.scenic.ScenicAppVO; import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO; -import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO; import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginReq; import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginRespVO; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; @@ -25,16 +24,7 @@ public interface AppScenicService { ApiResponse getDetails(Long id); - /** - * 首页景区列表，按照距离排序 - * - * @param scenicIndexVO - * @return - */ - ApiResponse> scenicList(ScenicIndexVO scenicIndexVO); - - - List faceContentList(Long userId, Long faceId); + List faceContentList(Long faceId); ApiResponse login(ScenicLoginReq scenicLoginReq) throws Exception; 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 74262fc..d28d2c0 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java @@ -40,9 +40,9 @@ public interface GoodsService { * @return */ VideoTaskStatusVO getAllTaskStatus(Long userId); - VideoTaskStatusVO getTaskStatusByFaceId(Long userId ,Long faceId); - VideoTaskStatusVO getTaskStatusByTemplateId(Long userId, Long faceId, Long templateId); + VideoTaskStatusVO getTaskStatusByFaceId(Long faceId); + VideoTaskStatusVO getTaskStatusByTemplateId(Long faceId, Long templateId); VideoTaskStatusVO getTaskStatusByScenicId(Long userId, Long scenicId); - ApiResponse sourceGoodsInfo(Long userId, Long sourceId); + ApiResponse sourceGoodsInfo(Long sourceId); } diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 06ea9be..64227ee 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -605,7 +605,7 @@ public class TaskTaskServiceImpl implements TaskService { if (scenicConfig != null && Integer.valueOf(2).equals(scenicConfig.getTemplateNewVideoType())) { log.info("景区{}启用：templateNewVideoType：全新视频不需要重新购买", task.getScenicId()); // 全新视频，不需要重新购买，旧视频在我的里面查看 - List entityList = videoMapper.listRelationByFaceAndTemplate(face.getMemberId(), face.getId(), task.getTemplateId()); + List entityList = videoMapper.listRelationByFaceAndTemplate(face.getId(), task.getTemplateId()); Optional buy = entityList.stream().filter(item -> Integer.valueOf(1).equals(item.getIsBuy())).findAny(); if (buy.isPresent()) { log.info("人脸{}，模板{}，已经被购买过，{}", face.getId(), task.getTemplateId(), buy.get()); diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml index 7b8e977..390f5b8 100644 --- a/src/main/resources/mapper/MemberMapper.xml +++ b/src/main/resources/mapper/MemberMapper.xml @@ -70,7 +70,7 @@ where id = #{id} select mv.* from member_video mv - where mv.member_id = #{userId} and mv.face_id = #{faceId} and mv.template_id = #{templateId} + where mv.face_id = #{faceId} and mv.template_id = #{templateId}