From 4f0d6dc44f38ba296f9dbc365a5595a65e8c2fec Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 21 Nov 2025 19:27:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E4=BA=BA=E8=84=B8ID=E6=9F=A5=E8=AF=A2=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在OrderBiz中增加isBuy方法重载，支持通过人脸ID查询购买记录 - 修改AppPuzzleController中调用参数顺序，适配新方法签名 - 在OrderMapper接口中新增getUserBuyFaceItem方法定义 - 在OrderMapper.xml中实现getUserBuyFaceItem的SQL查询逻辑 - 调整FaceServiceImpl中相关调用逻辑，移除冗余配置获取代码 --- src/main/java/com/ycwl/basic/biz/OrderBiz.java | 11 +++++++++++ .../basic/controller/mobile/AppPuzzleController.java | 2 +- src/main/java/com/ycwl/basic/mapper/OrderMapper.java | 2 ++ .../ycwl/basic/service/pc/impl/FaceServiceImpl.java | 1 - src/main/resources/mapper/OrderMapper.xml | 11 +++++++++++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java index 5569ac30..91eaba52 100644 --- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java +++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java @@ -160,6 +160,17 @@ public class OrderBiz { return null; } } + public IsBuyRespVO isBuy(Long scenicId, Long memberId, Long faceId, int goodsType, Long goodsId) { + IsBuyRespVO respVO = new IsBuyRespVO(); + OrderEntity orderEntity = orderMapper.getUserBuyFaceItem(memberId, faceId, goodsType, goodsId); + if (orderEntity != null) { + respVO.setOrderId(orderEntity.getId()); + respVO.setBuy(true); + respVO.setFree(false); + return respVO; + } + return isBuy(memberId, scenicId, goodsType, goodsId); + } public IsBuyRespVO isBuy(Long userId, Long scenicId, int goodsType, Long goodsId) { IsBuyRespVO respVO = new IsBuyRespVO(); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java index 7c2e3883..c5e98700 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java @@ -205,7 +205,7 @@ public class AppPuzzleController { // 设置模板ID vo.setTemplateId(record.getTemplateId()); - IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), 5, record.getTemplateId()); + IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getScenicId(), face.getMemberId(), face.getId(), 5, record.getTemplateId()); if (isBuyRespVO.isBuy()) { vo.setIsBuy(1); } else { diff --git a/src/main/java/com/ycwl/basic/mapper/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/OrderMapper.java index b022369e..60bd4042 100644 --- a/src/main/java/com/ycwl/basic/mapper/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/OrderMapper.java @@ -59,4 +59,6 @@ public interface OrderMapper { int updateMemberIdByFaceId(OrderEntity orderEntity); List getOrderItems(Long orderId); + + OrderEntity getUserBuyFaceItem(Long memberId, Long faceId, int goodsType, Long goodsId); } diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java index 03724493..ebcfa17d 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java @@ -518,7 +518,6 @@ public class FaceServiceImpl implements FaceService { sourceImageContent.setLockType(-1); sourceVideoContent.setGroup("直出原片"); sourceImageContent.setGroup("直出原片"); - ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(face.getScenicId()); if (!scenicConfigFacade.isDisableSourceImage(face.getScenicId())) { IsBuyRespVO isBuyRespVO = orderBiz.isBuy(userId, face.getScenicId(), SourceType.IMAGE.getCode(), faceId); sourceImageContent.setSourceType(isBuyRespVO.getGoodsType()); diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index 5df25000..f2d88f05 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -519,6 +519,17 @@ + update `order` set member_id = #{memberId}