diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java index 55665f4..0039e32 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/SavingGoalDto.java @@ -29,6 +29,9 @@ public class SavingGoalDto { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd") private LocalDate startDuration; diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java index e04c308..9a3574a 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalAddDto.java @@ -39,6 +39,11 @@ public class SavingGoalAddDto { @Min(value = 0, message = "储蓄值不能小于0") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + @NotNull(message = "目标金额不能为空") + @Min(value = 0, message = "储蓄值不能小于0") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @NotNull(message = "开始目标时长不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java index 1bbda47..0cb41af 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/admin/SavingGoalUpdateDto.java @@ -43,6 +43,11 @@ public class SavingGoalUpdateDto { @Min(value = 0, message = "金额格式不正确") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + @NotNull(message = "目标金额不能为空") + @Min(value = 0, message = "储蓄值不能小于0") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @NotNull(message = "开始目标时长不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalAddUserDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalAddUserDto.java index d96c928..eb6f2d8 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalAddUserDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalAddUserDto.java @@ -35,6 +35,11 @@ public class SavingGoalAddUserDto { @Min(value = 0, message = "储蓄值不能小于0") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + @NotNull(message = "目标金额不能为空") + @Min(value = 0, message = "储蓄值不能小于0") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @NotNull(message = "开始目标时长不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalUpdateUserDto.java b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalUpdateUserDto.java index 51a799d..c381e80 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalUpdateUserDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/financial/savingGoal/user/SavingGoalUpdateUserDto.java @@ -39,6 +39,11 @@ public class SavingGoalUpdateUserDto { @Min(value = 0, message = "金额格式不正确") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + @NotNull(message = "目标金额不能为空") + @Min(value = 0, message = "储蓄值不能小于0") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @NotNull(message = "开始目标时长不能为空") @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java index 3f929cc..ad9e0e4 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java +++ b/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java @@ -37,6 +37,9 @@ public class SavingGoal extends BaseEntity { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") private LocalDateTime startDuration; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java index 049510b..5ac489f 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java @@ -39,6 +39,9 @@ public class SavingGoalVo extends BaseUserVo { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java index 5036306..5b2c96b 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java @@ -29,6 +29,9 @@ public class SavingGoalUserVo extends BaseVo { @Schema(name = "amount", title = "目标金额") private BigDecimal amount; + @Schema(name = "amountDeposited", title = "已存入金额") + private BigDecimal amountDeposited; + @Schema(name = "startDuration", title = "开始目标时长") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = LocalDateTimeSerializer.class) diff --git a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java index 720cb94..3122e10 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java @@ -4,6 +4,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddUserDto; +import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateUserDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; @@ -87,7 +88,7 @@ public class SavingGoalController { @Operation(summary = "用户更新储值", description = "用户更新储值") @PutMapping("noManage/updateUserSavingGoal") - public Mono> updateUserSavingGoal(@Valid @RequestBody SavingGoalUpdateDto dto) { + public Mono> updateUserSavingGoal(@Valid @RequestBody SavingGoalUpdateUserDto dto) { savingGoalService.updateUserSavingGoal(dto); return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS)); } diff --git a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java index aa19b5b..38c23cb 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java @@ -4,6 +4,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddUserDto; +import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateUserDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; @@ -73,7 +74,7 @@ public interface SavingGoalService extends IService { * * @param dto 更新表单 */ - void updateUserSavingGoal(SavingGoalUpdateDto dto); + void updateUserSavingGoal(@Valid SavingGoalUpdateUserDto dto); /** * 用户删除储值 diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java index 0608c3c..3429216 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java @@ -6,6 +6,7 @@ import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddUserDto; +import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateUserDto; import cn.bunny.dao.entity.financial.SavingGoal; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.ResultCodeEnum; @@ -147,7 +148,7 @@ public class SavingGoalServiceImpl extends ServiceImpl and base.amount like CONCAT('%',#{dto.amount},'%') + + and base.amount_deposited like CONCAT('%',#{dto.amountDeposited},'%') + and ( (base.start_duration between #{dto.startDuration} and #{dto.endDuration})