From a03d3707865a2ee6c1f1ed9e326ca442c8478c76 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 14 May 2024 14:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/response/MarriageBountyOrderProductRecordVo.java | 4 ++-- .../marriagebounty/MarriageBountyOrderApplicationService.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/MarriageBountyOrderProductRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/MarriageBountyOrderProductRecordVo.java index 5263996..ee27d0a 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/MarriageBountyOrderProductRecordVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/MarriageBountyOrderProductRecordVo.java @@ -5,14 +5,14 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @Data public class MarriageBountyOrderProductRecordVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDate createTime; + private LocalDateTime createTime; @ApiModelProperty("奖励金额") private BigDecimal rewardAmount; 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 d6a944b..79b0e0e 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 @@ -108,7 +108,6 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic orderItem.getSubCategory(), productSpec.getUnitOriginalPrice(), productSpec.getUnitOriginalPrice())); rewardCategoryPriceMap.put(orderItem.getSubCategory().getValue(), orderItem.getUnitSettlementPrice()); }); - marriageBountyOrder.setProductRecordList(Collections.singletonList(productRecord)); //悬赏招亲订单奖励 for (MarriageBountyOrderReward orderReward : marriageBountyOrder.getOrderRewardList()) { if (!orderReward.getIsReceive()) { @@ -119,6 +118,8 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic } } marriageBountyOrder.calculateRewardAmount(); + productRecord.setRewardAmount(marriageBountyOrder.getRewardAmount()); + marriageBountyOrder.setProductRecordList(Collections.singletonList(productRecord)); marriageBountyOrderAggregate.update(marriageBountyOrder); } }