From 848bfc94e4bc9df0b4b0b5066149560cd7158c24 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 15 Oct 2024 17:24:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarriageBountyOrderApplicationService.java | 6 +++--- .../application/service/order/OrderApplicationService.java | 4 ++-- .../marriagebounty/MarriageBountyOrderQueryService.java | 2 +- .../impl/MarriageBountyOrderQueryServiceImpl.java | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java index 8bd8e6f..32f57f7 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java @@ -69,10 +69,10 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic public void save(Long orderId) { Order order = orderRepository.load(orderId); MarriageBountyOrder marriageBountyOrder; - marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), + marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getMiId(), MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); if (Objects.nonNull(marriageBountyOrder)) { - marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), + marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getMiId(), MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); if (Objects.nonNull(marriageBountyOrder)) { //修改悬赏招亲订单 @@ -112,7 +112,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic marriageBountyOrderAggregate.update(marriageBountyOrder); } } else { - marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), + marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getMiId(), MarriageBountyOrderStatusEnum.INIT, MarriageBountyOrderPaymentStatusEnum.INIT); if (Objects.nonNull(marriageBountyOrder)) { //订单关系 diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index 99540bf..f281794 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -208,7 +208,7 @@ public class OrderApplicationService extends BaseApplicationService { //3. 订单金额计算 countMarriageBountyOrderAmount(marriageBountyOrder.getPublishType(), order); //3.1. 低消确认 - MarriageBountyOrder existMarriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), + MarriageBountyOrder existMarriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getMiId(), MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); if (Objects.isNull(existMarriageBountyOrder)) { checkMinAmount(marriageBountyOrder, order); @@ -303,7 +303,7 @@ public class OrderApplicationService extends BaseApplicationService { } private void fillMarriageBountyOrderInfo(Order order, List productList, Integer meetingQuantity) { - MarriageBountyOrder marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); + MarriageBountyOrder marriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getMiId(), MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); order.setOrderBelonging(OrderBelongingEnum.CUSTOMER); MarriageInformation marriageInformation = marriageInformationDao.selectById(order.getMiId()); order.setOrderBelongName(marriageInformation.getNickName()); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/MarriageBountyOrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/MarriageBountyOrderQueryService.java index af9acc3..a832fb0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/MarriageBountyOrderQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/MarriageBountyOrderQueryService.java @@ -8,7 +8,7 @@ import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrder import com.qniao.dam.domian.aggregate.marriagebount.constant.MarriageBountyOrderStatusEnum; public interface MarriageBountyOrderQueryService { - MarriageBountyOrder queryBy(Long userId, Long miId, MarriageBountyOrderStatusEnum status, MarriageBountyOrderPaymentStatusEnum paymentStatus); + MarriageBountyOrder queryBy(Long miId, MarriageBountyOrderStatusEnum status, MarriageBountyOrderPaymentStatusEnum paymentStatus); UserGetMarriageBountyOrderPreRefundInfoVo getMarriageBountyOrderPreRefundInfo(Long marriageBountyOrderId,boolean management); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java index 3af639b..7890d02 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java @@ -40,10 +40,9 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ private RewardConfigQueryService rewardConfigQueryService; @Override - public MarriageBountyOrder queryBy(Long userId, Long miId, MarriageBountyOrderStatusEnum status, + public MarriageBountyOrder queryBy(Long miId, MarriageBountyOrderStatusEnum status, MarriageBountyOrderPaymentStatusEnum paymentStatus) { MarriageBountyOrder marriageBountyOrder = marriageBountyOrderDao.selectOne(new LambdaQueryWrapper() - .eq(MarriageBountyOrder::getUserId, userId) .eq(MarriageBountyOrder::getMiId, miId) .eq(MarriageBountyOrder::getStatus, status) .eq(MarriageBountyOrder::getPaymentStatus, paymentStatus)