From fb82329a882230677ab40186a9a45401d8374b94 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 21 Nov 2025 19:45:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=B4=AD=E4=B9=B0=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整isBuy方法参数顺序，确保 memberId 和 scenicId 正确传递 - 在OrderBiz中设置默认buy状态为false，避免空指针异常 - 修改OrderMapper查询条件，增加refund_status=0过滤已退款订单 - 优化face服务中调用isBuy方法时的参数传递逻辑 --- src/main/java/com/ycwl/basic/biz/OrderBiz.java | 3 ++- .../java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java | 2 +- src/main/resources/mapper/OrderMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java index 91eaba52..f3e7936b 100644 --- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java +++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java @@ -169,7 +169,8 @@ public class OrderBiz { respVO.setFree(false); return respVO; } - return isBuy(memberId, scenicId, goodsType, goodsId); + respVO.setBuy(false); + return respVO; } public IsBuyRespVO isBuy(Long userId, Long scenicId, 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 ebcfa17d..4a6442ee 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 @@ -471,7 +471,7 @@ public class FaceServiceImpl implements FaceService { sfpContent.setTemplateCoverUrl(template.getCoverImage()); sfpContent.setGoodsType(3); sfpContent.setSort(0); - IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), 5, records.getFirst().getTemplateId()); + IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getScenicId(), face.getMemberId(), faceId, 5, records.getFirst().getTemplateId()); if (isBuyRespVO.isBuy()) { sfpContent.setIsBuy(1); } else { diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index f2d88f05..966db692 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -523,11 +523,12 @@ select o.* from order_item oi left join `order` o on o.id = oi.order_id - where o.member_id = #{userId} + where o.member_id = #{memberId} and o.face_id = #{faceId} and oi.goods_id = #{goodsId} and oi.goods_type = #{goodsType} and o.status = 1 + and o.refund_status = 0 limit 1