悬赏招亲

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)) {
                 //订单关系

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<Product> 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());

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);
 

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<MarriageBountyOrder>()
-                .eq(MarriageBountyOrder::getUserId, userId)
                 .eq(MarriageBountyOrder::getMiId, miId)
                 .eq(MarriageBountyOrder::getStatus, status)
                 .eq(MarriageBountyOrder::getPaymentStatus, paymentStatus)