diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java new file mode 100644 index 0000000..723c315 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargePage.java @@ -0,0 +1,15 @@ +package com.example.commons.domain.vo; + +import com.example.commons.domain.entity.Activity; +import com.example.commons.domain.entity.Recharge; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class RechargePage { + private Integer pageNum; + private Integer pageSize; + + private RechargeVo rechargeVo; +} diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java index eb28e8e..29c7695 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java @@ -29,7 +29,7 @@ public class AuditController { } } @PostMapping - public Result search(Integer pageNum,Integer pageSize,@RequestBody Audit audit){ + public Result search(@RequestBody Integer pageNum,@RequestBody Integer pageSize,@RequestBody Audit audit){ if(ObjectUtils.isEmpty(pageNum)){ return Result.success(auditService.search(audit)); } diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java index f6e70a5..2e12f40 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java @@ -2,6 +2,7 @@ package com.example.recharge.controller; import com.example.commons.domain.entity.Recharge; +import com.example.commons.domain.vo.RechargePage; import com.example.commons.domain.vo.RechargeVo; import com.example.commons.domain.vo.Result; import com.example.commons.sevice.RechargeService; @@ -42,12 +43,12 @@ public class RechargeController { return Result.success(); } @PostMapping - public Result search(Integer pageNum, Integer pageSize,@RequestBody RechargeVo rechargeVo) { - if(ObjectUtils.isEmpty(pageNum)){ - return Result.success(rechargeService.search(rechargeVo)); + public Result search(@RequestBody RechargePage rechargePage) { + if(ObjectUtils.isEmpty(rechargePage.getPageNum())){ + return Result.success(rechargeService.search(rechargePage.getRechargeVo())); } - else { - return Result.success(rechargeService.searchForPage(pageNum,pageSize,rechargeVo)); + else { + return Result.success(rechargeService.searchForPage(rechargePage.getPageNum(),rechargePage.getPageSize(),rechargePage.getRechargeVo())); } } } diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java index ea40137..01ab5a8 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java @@ -24,14 +24,7 @@ public interface ActivityMapper { "" diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java index 72b62de..899eed9 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java @@ -51,7 +51,7 @@ public interface RateMapper { "select * from rate", "", "rate_id =#{rateId}", - "start_time >=#{startTime}", + "and start_time >=#{startTime}", "and end_time <=#{endTime}", "and currency like concat('%','#{currency}','%')", "and exchange_rate like concat('%','#{exchangeRate}','%')",