admin1/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了接口（web端管理员添加项目结算记录）

Browse Source
This commit is contained in:
chen-xin-zhi 2025-06-06 09:17:26 +08:00
parent 979b18653f
commit 21dbba9ffc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java
View File

@ -145,6 +145,13 @@ public class ProjectSettlementController {
public BaseResponse<Boolean> addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) { public BaseResponse<Boolean> addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) {
// 添加当前用户的项目结算记录 // 添加当前用户的项目结算记录
ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class);
// 根据项目名称获取项目明细id
String projectDetailName = projectSettlement.getProjectDetailName();
Long projectId = projectSettlement.getProjectId();
Map<SFunction<ProjectDetail, ?>, Object> fieldConditions = Map.of(ProjectDetail::getProjectId, projectId, ProjectDetail::getProjectDetailName, projectDetailName);
List<ProjectDetail> projectDetails = commonService.findByFieldEqTargetFields(fieldConditions, projectDetailService);
ProjectDetail proDetail = projectDetails.get(0);
projectSettlement.setProjectDetailId(proDetail.getId());
projectSettlementService.save(projectSettlement); projectSettlementService.save(projectSettlement);
Long userId = projectSettlement.getUserId(); Long userId = projectSettlement.getUserId();
@ -181,6 +188,7 @@ public class ProjectSettlementController {
BigDecimal commissionRatePrice = subUserProjectCommissionMap.get(uid + "-" + subUid); BigDecimal commissionRatePrice = subUserProjectCommissionMap.get(uid + "-" + subUid);
if (commissionRatePrice.compareTo(BigDecimal.ZERO) == 0) continue; if (commissionRatePrice.compareTo(BigDecimal.ZERO) == 0) continue;
ProjectSettlement projectSettle = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); ProjectSettlement projectSettle = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class);
projectSettle.setProjectDetailId(projectDetailId);
projectSettle.setSettlementRevenue(commissionRatePrice); projectSettle.setSettlementRevenue(commissionRatePrice);
projectSettle.setRevenueSource(true); projectSettle.setRevenueSource(true);
projectSettle.setSuperId(projectSettlementId); projectSettle.setSuperId(projectSettlementId);

8
src/main/java/com/greenorange/promotion/model/dto/projectSettlement/ProjectSettlementAddRequest.java
View File

@ -25,7 +25,6 @@ import java.util.Date;
"settlementTime", "settlementTime",
"promoCodeApplyId", "promoCodeApplyId",
"projectId", "projectId",
"projectDetailId",
"userId" "userId"
}) })
public class ProjectSettlementAddRequest implements Serializable { public class ProjectSettlementAddRequest implements Serializable {
@ -75,13 +74,6 @@ public class ProjectSettlementAddRequest implements Serializable {
@Schema(description = "项目id", example = "1") @Schema(description = "项目id", example = "1")
private Long projectId; private Long projectId;
/**
* 项目明细id
*/
@Min(value = 1L, message = "项目明细id ID不能小于1")
@Schema(description = "项目明细", example = "1")
private Long projectDetailId;
/** /**
* 用户id * 用户id
*/ */