From c2a90fe9b624486b64f03b0770050e0c3eea6b9d Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 17 Oct 2024 18:40:25 +0800 Subject: [PATCH 1/6] =?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 --- .../dam/application/service/order/OrderApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f281794..1b7e577 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 @@ -282,7 +282,7 @@ public class OrderApplicationService extends BaseApplicationService { private void checkMinAmount(MarriageBountyOrder marriageBountyOrder, Order order) { RewardTypeEnum rewardType = marriageBountyOrder.getMinAmountType(); RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(rewardType); - if (Objects.nonNull(rewardConfig) && new BigDecimal(rewardConfig.getValue()).compareTo(order.getSettlementAmount()) > 0) { + if (Objects.nonNull(rewardConfig) && new BigDecimal(rewardConfig.getValue()).compareTo(order.getOriginalAmount()) > 0) { throw new BizException("悬赏招亲发布最低" + rewardConfig.getValue() + "元"); } } From 55541faacf8835f52ebf304aa3dfc40616ccb52c Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 21 Oct 2024 17:38:37 +0800 Subject: [PATCH 2/6] =?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 --- .../dam/application/handler/order/OrderEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java index 62e21be..ca0fcae 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java @@ -125,7 +125,7 @@ public class OrderEventHandler extends BaseApplicationService { if (Objects.nonNull(term)) { validityPeriodDays = Integer.parseInt(term.getValue()); } - PaidMatchmakerFeeBySdkDto dto = new PaidMatchmakerFeeBySdkDto(order.getUserId(), validityPeriodDays); + PaidMatchmakerFeeBySdkDto dto = new PaidMatchmakerFeeBySdkDto(order.getUserId(), order.getSettlementAmount(), validityPeriodDays); uecServerApplicationService.userPaidMatchmakerFee(dto); } //悬赏招亲 @@ -161,7 +161,7 @@ public class OrderEventHandler extends BaseApplicationService { Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL); ProductSpec productSpec = product.getProductSpecList().get(0); OrderItem orderItem = OrderItem.build(productSpec.getProductId(), productSpec.getId(), product.getProductType(), product.getMainCategory(), product.getSubCategory(), - product.getProductTitle(), BigDecimal.ZERO,BigDecimal.ZERO, 1); + product.getProductTitle(), BigDecimal.ZERO, BigDecimal.ZERO, 1); orderItem.setSettlementAmount(BigDecimal.ZERO); order.setSettlementAmount(BigDecimal.ZERO); order.setOrderItemList(Collections.singletonList(orderItem)); From 40aced39bf00161b154ced6258fb8161c0f52a6a Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 21 Oct 2024 17:42:47 +0800 Subject: [PATCH 3/6] =?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 --- .../dam/application/handler/order/OrderEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java index ca0fcae..62e21be 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java @@ -125,7 +125,7 @@ public class OrderEventHandler extends BaseApplicationService { if (Objects.nonNull(term)) { validityPeriodDays = Integer.parseInt(term.getValue()); } - PaidMatchmakerFeeBySdkDto dto = new PaidMatchmakerFeeBySdkDto(order.getUserId(), order.getSettlementAmount(), validityPeriodDays); + PaidMatchmakerFeeBySdkDto dto = new PaidMatchmakerFeeBySdkDto(order.getUserId(), validityPeriodDays); uecServerApplicationService.userPaidMatchmakerFee(dto); } //悬赏招亲 @@ -161,7 +161,7 @@ public class OrderEventHandler extends BaseApplicationService { Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL); ProductSpec productSpec = product.getProductSpecList().get(0); OrderItem orderItem = OrderItem.build(productSpec.getProductId(), productSpec.getId(), product.getProductType(), product.getMainCategory(), product.getSubCategory(), - product.getProductTitle(), BigDecimal.ZERO, BigDecimal.ZERO, 1); + product.getProductTitle(), BigDecimal.ZERO,BigDecimal.ZERO, 1); orderItem.setSettlementAmount(BigDecimal.ZERO); order.setSettlementAmount(BigDecimal.ZERO); order.setOrderItemList(Collections.singletonList(orderItem)); From a1e1858c2a1d867c1e8cfea562df02e6ba7e8f79 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 28 Oct 2024 18:25:20 +0800 Subject: [PATCH 4/6] =?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 --- .../dam/api/query/product/user/ProductUserQueryController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java index 047a237..84a3820 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java @@ -67,8 +67,7 @@ public class ProductUserQueryController { @GetMapping("page/product/by/matchmaker") @ApiOperation("红娘合伙人获取商品分页列表") public QnPage userPageProductByMatchMaker(PageUtil pageUtil, - UserPageProductByMatchmakerQueryParam queryParam, - @RequestParam("userId") Long userId) { + UserPageProductByMatchmakerQueryParam queryParam) { return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil, queryParam), UserPageProductByMatchmakerVo.class); } From eb0e6134ffbed7ceae9db0595ac8aa3240c45919 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 29 Oct 2024 09:44:13 +0800 Subject: [PATCH 5/6] =?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 --- .../mapper/order/WalletAccountAssociateOrderRecordDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml index 65fb15f..13b7cef 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml @@ -100,6 +100,7 @@ dao.order_belong_name, dao.order_type, dao.order_code, + dao.original_amount, dao.settlement_amount, dao.paid_time, dao.`status` From 7193d05114f347c13533554173a65921c309c55c Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 29 Oct 2024 10:32:12 +0800 Subject: [PATCH 6/6] =?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 --- .../user/RevenueRewardUserQueryController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java index 5009ee0..ee6793b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java @@ -43,11 +43,12 @@ public class RevenueRewardUserQueryController { UsePageRevenueRewardRecordQueryParams queryParams, @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { - if (Objects.isNull(queryParams.getQueryOrgId())) { - queryParams.setQueryOrgId(orgId); - } if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); + if (Objects.nonNull(orgId)){ + queryParams.setQueryOrgId(orgId); + }else{ + queryParams.setQueryUserId(userId); + } } return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams), UseGetRevenueRewardRecordVo.class); }