diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index b780b3a2..1b77e452 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -96,7 +96,7 @@ public class PaymentTask { // } -// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void updateAffiliateInfoWithPayment(){ // log.info("佣金计算定时器"); affiliateService.updateAffiliateInfoWithPayment(); diff --git a/src/main/java/com/ai/da/controller/AffiliateController.java b/src/main/java/com/ai/da/controller/AffiliateController.java index 853580bf..ba6887eb 100644 --- a/src/main/java/com/ai/da/controller/AffiliateController.java +++ b/src/main/java/com/ai/da/controller/AffiliateController.java @@ -43,7 +43,7 @@ public class AffiliateController { @ApiOperation(value = "获取affiliate列表") @PostMapping("/list") - public Response> getAffiliateList(@Valid @RequestBody AffiliateQueryDTO affiliateQueryDTO) { + public Response> getAffiliateList(@Validated @RequestBody AffiliateQueryDTO affiliateQueryDTO) { return Response.success(affiliateService.getAffiliateList(affiliateQueryDTO)); } diff --git a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java index 54fbf7fc..da414a82 100644 --- a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; @EqualsAndHashCode(callSuper = true) @Data @@ -18,6 +19,7 @@ public class AffiliateQueryDTO extends TimeQueryBaseDTO{ private Long affiliateId; @NotBlank(message = "orderBy cannot be empty") + @Pattern(regexp = "id|createTime|totalIncome", message = "允许排序字段只有id|createTime|totalIncome") @ApiModelProperty("目前允许按id, createTime, totalIncome进行排序") private String orderBy;