From 21dbba9ffc14363c494fedb67036f78bf1c3847f Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Fri, 6 Jun 2025 09:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=88web=E7=AB=AF=E7=AE=A1=E7=90=86=E5=91=98=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BB=93=E7=AE=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectSettlement/ProjectSettlementController.java | 8 ++++++++ .../projectSettlement/ProjectSettlementAddRequest.java | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java index 7ef45bc..8989a5f 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java @@ -145,6 +145,13 @@ public class ProjectSettlementController { public BaseResponse addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) { // 添加当前用户的项目结算记录 ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); + // 根据项目名称获取项目明细id + String projectDetailName = projectSettlement.getProjectDetailName(); + Long projectId = projectSettlement.getProjectId(); + Map, Object> fieldConditions = Map.of(ProjectDetail::getProjectId, projectId, ProjectDetail::getProjectDetailName, projectDetailName); + List projectDetails = commonService.findByFieldEqTargetFields(fieldConditions, projectDetailService); + ProjectDetail proDetail = projectDetails.get(0); + projectSettlement.setProjectDetailId(proDetail.getId()); projectSettlementService.save(projectSettlement); Long userId = projectSettlement.getUserId(); @@ -181,6 +188,7 @@ public class ProjectSettlementController { BigDecimal commissionRatePrice = subUserProjectCommissionMap.get(uid + "-" + subUid); if (commissionRatePrice.compareTo(BigDecimal.ZERO) == 0) continue; ProjectSettlement projectSettle = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); + projectSettle.setProjectDetailId(projectDetailId); projectSettle.setSettlementRevenue(commissionRatePrice); projectSettle.setRevenueSource(true); projectSettle.setSuperId(projectSettlementId); diff --git a/src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java b/src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java index 8f9bc64..9e85086 100644 --- a/src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java +++ b/src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java @@ -25,7 +25,6 @@ import java.util.Date; "settlementTime", "promoCodeApplyId", "projectId", - "projectDetailId", "userId" }) public class ProjectSettlementAddRequest implements Serializable { @@ -75,13 +74,6 @@ public class ProjectSettlementAddRequest implements Serializable { @Schema(description = "项目id", example = "1") private Long projectId; - /** - * 项目明细id - */ - @Min(value = 1L, message = "项目明细id ID不能小于1") - @Schema(description = "项目明细", example = "1") - private Long projectDetailId; - /** * 用户id */