From 6a1afa177389b408a845d606bca669dcfa12e24e Mon Sep 17 00:00:00 2001 From: zhangluping <1801075613@qq.com> Date: Mon, 16 Dec 2024 11:13:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/AuditController.java | 90 +++++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java index 03358d4..618a220 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/AuditController.java @@ -17,6 +17,8 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.Month; import java.util.Arrays; @RestController @@ -41,9 +43,74 @@ public class AuditController { return Result.error(e.getMessage()); } } - @PostMapping("/edit") + + + +// @PostMapping("/edit") +// public Result edit(@RequestBody Audit audit) { +// log.info("Starting edit for audit: {}", audit); +// try { +// // 执行 edit 操作 +// auditService.edit(audit); +// log.info("Audit service edit completed."); +// +// // 判断是否满足条件 +// if (audit.getStatus() == 1) { +// log.info("Audit status is 1."); +// +// if (audit.getRefundId() != null) { +// log.info("Refund ID: {}", audit.getRefundId()); +// +// Detail detail = detailMapper.selectByRefundId(audit.getRefundId()); +// if (detail != null) { +// log.info("Detail found: {}", detail); +// +// BigDecimal rechargeCoin = detail.getRechargeCoin(); +// BigDecimal taskCoin = detail.getTaskCoin(); +// BigDecimal freeCoin = detail.getFreeCoin(); +// log.info("RechargeCoin: {}, TaskCoin: {}, FreeCoin: {}", rechargeCoin, taskCoin, freeCoin); +// +// User user = userMapper.selectByJwcode(detail.getJwcode()); +// if (user != null) { +// log.info("User found: {}", user); +// +// // 更新用户金币信息 +// user.setBuyJb(user.getBuyJb().add(rechargeCoin)); +// user.setCoreJb(user.getCoreJb().add(taskCoin)); +// user.setFree6(user.getFree6().add(freeCoin)); +// log.info("Updated User: {}", user); +// +// // 更新用户 +// userMapper.update(user); +// log.info("User updated successfully."); +// } else { +// log.warn("No user found for jwcode: {}", detail.getJwcode()); +// } +// } else { +// log.warn("No detail found for refund ID: {}", audit.getRefundId()); +// } +// } else { +// log.warn("Refund ID is null for audit: {}", audit); +// } +// } else { +// log.info("Audit status is not 1, skipping user update."); +// } +// +// return Result.success(); +// } catch (Exception e) { +// log.error("Error during edit operation", e); +// return Result.error("Error during edit operation: " + e.getMessage()); +// } +// } + + @PostMapping("/edit") public Result edit(@RequestBody Audit audit){ + //先执行auditService.edit(audit); + //然后创建一个类，去接收这个audit，如果status=1 + //根据退款ID找到detail表中的记录获取到他的三种金币 + //把金币加到user表中对应的金币中 + auditService.edit(audit); if(audit.getStatus() == 1 && audit.getRefundId()!=null){ Detail detail = detailMapper.selectByRefundId(audit.getRefundId()); @@ -54,10 +121,29 @@ public class AuditController { User user = userMapper.selectByJwcode(detail.getJwcode()); user.setBuyJb(user.getBuyJb().add(rechargeCoin)); user.setCoreJb(user.getCoreJb().add(taskCoin)); - user.setFree6(user.getFree6().add(freeCoin)); + + LocalDate now = LocalDate.now(); + Month currentMonth = now.getMonth(); + + // 判断月份范围并返回对应值 + if (currentMonth.getValue() <= 6) { + user.setFree6(user.getFree6().add(freeCoin)); // 在1月到6月时返回的值 + } else { + user.setFree12(user.getFree12().add(freeCoin)); // 在7月到12月时返回的值 + } userMapper.update(user); + + } return Result.success(); + // +// try { +// auditService.edit(audit); +// return Result.success(); +// }catch (Exception e){ +// log.warn(Arrays.toString(e.getStackTrace())); +// return Result.error(e.getMessage()); +// } } @PostMapping public Result search(@RequestBody Page page){ From 3a2e14f8305fa8395112c322a250b2d90e7b4e12 Mon Sep 17 00:00:00 2001 From: zhangluping <1801075613@qq.com> Date: Mon, 16 Dec 2024 17:25:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/AuditController.java | 89 +++++++--------------- .../java/com/example/demo/mapper/DetailMapper.java | 3 +- .../com/example/demo/mapper/RechargeMapper.java | 2 +- 3 files changed, 30 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java index 618a220..ffbc0b5 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/AuditController.java @@ -7,6 +7,7 @@ import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; import com.example.demo.mapper.DetailMapper; +import com.example.demo.mapper.RechargeMapper; import com.example.demo.mapper.UserMapper; import com.example.demo.sevice.AuditService; import lombok.RequiredArgsConstructor; @@ -44,66 +45,7 @@ public class AuditController { } } - - -// @PostMapping("/edit") -// public Result edit(@RequestBody Audit audit) { -// log.info("Starting edit for audit: {}", audit); -// try { -// // 执行 edit 操作 -// auditService.edit(audit); -// log.info("Audit service edit completed."); -// -// // 判断是否满足条件 -// if (audit.getStatus() == 1) { -// log.info("Audit status is 1."); -// -// if (audit.getRefundId() != null) { -// log.info("Refund ID: {}", audit.getRefundId()); -// -// Detail detail = detailMapper.selectByRefundId(audit.getRefundId()); -// if (detail != null) { -// log.info("Detail found: {}", detail); -// -// BigDecimal rechargeCoin = detail.getRechargeCoin(); -// BigDecimal taskCoin = detail.getTaskCoin(); -// BigDecimal freeCoin = detail.getFreeCoin(); -// log.info("RechargeCoin: {}, TaskCoin: {}, FreeCoin: {}", rechargeCoin, taskCoin, freeCoin); -// -// User user = userMapper.selectByJwcode(detail.getJwcode()); -// if (user != null) { -// log.info("User found: {}", user); -// -// // 更新用户金币信息 -// user.setBuyJb(user.getBuyJb().add(rechargeCoin)); -// user.setCoreJb(user.getCoreJb().add(taskCoin)); -// user.setFree6(user.getFree6().add(freeCoin)); -// log.info("Updated User: {}", user); -// -// // 更新用户 -// userMapper.update(user); -// log.info("User updated successfully."); -// } else { -// log.warn("No user found for jwcode: {}", detail.getJwcode()); -// } -// } else { -// log.warn("No detail found for refund ID: {}", audit.getRefundId()); -// } -// } else { -// log.warn("Refund ID is null for audit: {}", audit); -// } -// } else { -// log.info("Audit status is not 1, skipping user update."); -// } -// -// return Result.success(); -// } catch (Exception e) { -// log.error("Error during edit operation", e); -// return Result.error("Error during edit operation: " + e.getMessage()); -// } -// } - - @PostMapping("/edit") + @PostMapping("/edit") public Result edit(@RequestBody Audit audit){ //先执行auditService.edit(audit); @@ -112,8 +54,10 @@ public class AuditController { //把金币加到user表中对应的金币中 auditService.edit(audit); + + //退款驳回 if(audit.getStatus() == 1 && audit.getRefundId()!=null){ - Detail detail = detailMapper.selectByRefundId(audit.getRefundId()); + Detail detail = detailMapper.selectByDetailId(audit.getRefundId()); BigDecimal rechargeCoin = detail.getRechargeCoin(); BigDecimal taskCoin = detail.getTaskCoin(); BigDecimal freeCoin = detail.getFreeCoin(); @@ -131,9 +75,30 @@ public class AuditController { } else { user.setFree12(user.getFree12().add(freeCoin)); // 在7月到12月时返回的值 } - userMapper.update(user); + //充值驳回 + if(audit.getStatus() == 2 && audit.getRechargeId()!=null){ + Detail detail1 = detailMapper.selectByDetailId(audit.getDetailId()); + BigDecimal rechargeCoin1 = detail1.getRechargeCoin(); + BigDecimal taskCoin1 = detail1.getTaskCoin(); + BigDecimal freeCoin1 = detail1.getFreeCoin(); + + User user1 = userMapper.selectByJwcode(detail1.getJwcode()); + user1.setBuyJb(user1.getBuyJb().add(rechargeCoin1)); + user1.setCoreJb(user1.getCoreJb().add(taskCoin1)); + + LocalDate now1 = LocalDate.now(); + Month currentMonth1 = now1.getMonth(); + + // 判断月份范围并返回对应值 + if (currentMonth1.getValue() <= 6) { + user1.setFree6(user1.getFree6().subtract(freeCoin1)); + }else { + user1.setFree12(user1.getFree12().subtract(freeCoin1)); + } + } + userMapper.update(user); } return Result.success(); // diff --git a/src/main/java/com/example/demo/mapper/DetailMapper.java b/src/main/java/com/example/demo/mapper/DetailMapper.java index f3bfe86..f1f25a7 100644 --- a/src/main/java/com/example/demo/mapper/DetailMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailMapper.java @@ -26,7 +26,8 @@ public interface DetailMapper { @Select({ "SELECT * from detail where detail_id =#{detailId}" }) - Detail selectByRefundId(Integer detail_id); + Detail selectByDetailId(Integer detail_id); + @Select({ "" }) - List getBuyAndFree(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getBuyAndFree(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getBuyAndRecharge(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getBuyAndRecharge(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getBuyAndTask(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getBuyAndTask(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getBuy(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getBuy(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getPayAndFree(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getPayAndFree(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getPayAndRecharge(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getPayAndRecharge(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getPayAndTask(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); + List getPayAndTask(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); @Select({ "" }) - List getPay(@Param("searchStartTime") LocalDateTime searchStartTime, @Param("searchEndTime") LocalDateTime searchEndTime); -} + List getPay(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime); +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java index e950746..3c62217 100644 --- a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java @@ -50,24 +50,49 @@ public class ActivityServiceImpl implements ActivityService { } @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #activity.hashCode() ") @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Activity activity) { +// PageHelper.startPage(pageNum, pageSize); +// List list = activityMapper.select(activity); +// return new PageInfo<>(list); + PageHelper.startPage(pageNum, pageSize); + List list = activityMapper.select(activity); + Date nowDate = new Date(); + list.forEach(activity1 -> { + // 假设 getStartTime() 和 getEndTime() 返回的是 java.util.Date 类型 + Date startTime = activity1.getStartTime(); + Date endTime = activity1.getEndTime(); + + // 使用 Date 类的 before 和 after 方法进行比较 + if (nowDate.before(startTime)) { + activity1.setStatus(0); // 设置状态为 0 + } else if (nowDate.after(endTime)) { + activity1.setStatus(2); // 设置状态为 2 + } else { + activity1.setStatus(1); // 设置状态为 1 + } + + // 保存修改后的对象 + activityMapper.edit(activity1); + }); + return new PageInfo<>(list); + } +} + +// @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #activity.hashCode() ") +// @Override // public PageInfo searchForPage(Integer pageNum, Integer pageSize, Activity activity) { -//// PageHelper.startPage(pageNum, pageSize); -//// List list = activityMapper.select(activity); -//// return new PageInfo<>(list); -// // PageHelper.startPage(pageNum, pageSize); // List list = activityMapper.select(activity); -// Date nowDate = new Date(); -// list.forEach(activity1 -> { -// // 假设 getStartTime() 和 getEndTime() 返回的是 java.util.Date 类型 +// LocalDateTime nowDate = LocalDateTime.now(); +// +// for (Activity activity1 : list) { // Date startTime = activity1.getStartTime(); // Date endTime = activity1.getEndTime(); // -// // 使用 Date 类的 before 和 after 方法进行比较 -// if (nowDate.before(startTime)) { +// if (nowDate.isBefore(startTime)) { // activity1.setStatus(0); // 设置状态为 0 -// } else if (nowDate.after(endTime)) { +// } else if (nowDate.isAfter(endTime)) { // activity1.setStatus(2); // 设置状态为 2 // } else { // activity1.setStatus(1); // 设置状态为 1 @@ -75,32 +100,9 @@ public class ActivityServiceImpl implements ActivityService { // // // 保存修改后的对象 // activityMapper.edit(activity1); -// }); +// } +// +// // 返回分页信息 +// return new PageInfo<>(list); // } -//} - - public PageInfo searchForPage(Integer pageNum, Integer pageSize, Activity activity) { - PageHelper.startPage(pageNum, pageSize); - List list = activityMapper.select(activity); - LocalDateTime nowDate = LocalDateTime.now(); - - for (Activity activity1 : list) { - LocalDateTime startTime = activity1.getStartTime(); - LocalDateTime endTime = activity1.getEndTime(); - - if (nowDate.isBefore(startTime)) { - activity1.setStatus(0); // 设置状态为 0 - } else if (nowDate.isAfter(endTime)) { - activity1.setStatus(2); // 设置状态为 2 - } else { - activity1.setStatus(1); // 设置状态为 1 - } - - // 保存修改后的对象 - activityMapper.edit(activity1); - } - - // 返回分页信息 - return new PageInfo<>(list); - } -} \ No newline at end of file +//} \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 8750afe..203536f 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -4,8 +4,11 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Audit; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.ConsumeDetail; import com.example.demo.mapper.AuditMapper; +import com.example.demo.mapper.RechargeMapper; +import com.example.demo.mapper.UserMapper; import com.example.demo.sevice.AuditService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -16,12 +19,17 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.Month; import java.util.List; @Transactional @Service @RequiredArgsConstructor @CacheConfig(cacheNames = "audit") public class AuditServiceImpl implements AuditService { + + private final UserMapper userMapper; private final AuditMapper auditMapper; @CacheEvict(value = {"audit", "recharge"}, allEntries = true) @@ -36,6 +44,53 @@ public class AuditServiceImpl implements AuditService { return auditMapper.update(audit); } + @CacheEvict(value = {"audit", "recharge","refund"}, allEntries = true) + @Override + public int goldedit(Audit audit) throws Exception { + int result = auditMapper.update(audit); + if (result != 1) { + throw new Exception("Failed to insert recharge data"); + } + Integer auditFlag = audit.getAuditFlag(); + if(auditFlag == 1){ + String jwcode=audit.getRecharge().getJwcode(); + BigDecimal paidGold1 =audit.getRecharge().getPaidGold(); + BigDecimal freeGold1 =audit.getRecharge().getFreeGold(); + User user = userMapper.select(jwcode); + BigDecimal buyJb =user.getBuyJb(); + + buyJb = buyJb.add(paidGold1); + +// 设置更新后的Sumgold回到user对象 + user.setBuyJb(buyJb); + LocalDate now = LocalDate.now(); + +// 判断当前日期是在六月之前还是之后 + Month currentMonth = now.getMonth(); + boolean isBeforeJune = currentMonth.getValue() < Month.JUNE.getValue(); + boolean isJune = currentMonth.getValue() == Month.JUNE.getValue(); + boolean isAfterJune = currentMonth.getValue() > Month.JUNE.getValue(); + +// 根据月份更新 free6 或 free12 + if (isBeforeJune||isJune) { + // 如果是六月前，更新 free6 + BigDecimal free6 = user.getFree6().add(freeGold1); + user.setFree6(free6); + } else if (isAfterJune) { + // 如果是六月后，更新 free12 + BigDecimal free12 = user.getFree12().add(freeGold1); + user.setFree12(free12); + } + + System.out.println(user+"----------------------------------------------------------"); + result = userMapper.update(user); + if (result != 1) { + throw new Exception("Failed to insert recharge data"); + } + } + return auditMapper.update(audit); + } + @Override public List search(Audit audit) { return auditMapper.select(audit); diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 8ab2666..afe155e 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -57,10 +57,11 @@ public class ConsumeServiceImpl implements ConsumeService { // 判断当前日期是在六月之前还是之后 Month currentMonth = now.getMonth(); boolean isBeforeJune = currentMonth.getValue() < Month.JUNE.getValue(); + boolean isJune = currentMonth.getValue() == Month.JUNE.getValue(); boolean isAfterJune = currentMonth.getValue() > Month.JUNE.getValue(); // 根据月份更新 free6 或 free12 - if (isBeforeJune) { + if (isBeforeJune||isJune) { // 如果是六月前，更新 free6 BigDecimal free6 = user.getFree6().add(freeGold1); user.setFree6(free6); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index e1eb44f..c04306e 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -92,7 +92,6 @@ public class RechargeServiceImpl implements RechargeService { } detail.setJwcode(JwCode); detail.setActivityId(activityId); - detail.setTaskCoin(paidGold); detail.setRechargeCoin(rechargeGold); detail.setFreeCoin(freeGold); detail.setRechargeWay(rechargeWay); @@ -109,35 +108,35 @@ public class RechargeServiceImpl implements RechargeService { throw new Exception("Failed to insert another entity"); } - BigDecimal paidGold1 =recharge.getPaidGold(); - BigDecimal freeGold1 =recharge.getFreeGold(); - User user = userMapper.select(jwcode); - BigDecimal buyJb =user.getBuyJb(); - - buyJb = buyJb.add(paidGold1); - -// 设置更新后的Sumgold回到user对象 - user.setBuyJb(buyJb); - LocalDate now = LocalDate.now(); - -// 判断当前日期是在六月之前还是之后 - Month currentMonth = now.getMonth(); - boolean isBeforeJune = currentMonth.getValue() < Month.JUNE.getValue(); - boolean isAfterJune = currentMonth.getValue() > Month.JUNE.getValue(); - -// 根据月份更新 free6 或 free12 - if (isBeforeJune) { - // 如果是六月前，更新 free6 - BigDecimal free6 = user.getFree6().add(freeGold1); - user.setFree6(free6); - } else if (isAfterJune) { - // 如果是六月后，更新 free12 - BigDecimal free12 = user.getFree12().add(freeGold1); - user.setFree12(free12); - } - - System.out.println(user+"----------------------------------------------------------"); - result = userMapper.update(user); +// BigDecimal paidGold1 =recharge.getPaidGold(); +// BigDecimal freeGold1 =recharge.getFreeGold(); +// User user = userMapper.select(jwcode); +// BigDecimal buyJb =user.getBuyJb(); +// +// buyJb = buyJb.add(paidGold1); +// +//// 设置更新后的Sumgold回到user对象 +// user.setBuyJb(buyJb); +// LocalDate now = LocalDate.now(); +// +//// 判断当前日期是在六月之前还是之后 +// Month currentMonth = now.getMonth(); +// boolean isBeforeJune = currentMonth.getValue() < Month.JUNE.getValue(); +// boolean isAfterJune = currentMonth.getValue() > Month.JUNE.getValue(); +// +//// 根据月份更新 free6 或 free12 +// if (isBeforeJune) { +// // 如果是六月前，更新 free6 +// BigDecimal free6 = user.getFree6().add(freeGold1); +// user.setFree6(free6); +// } else if (isAfterJune) { +// // 如果是六月后，更新 free12 +// BigDecimal free12 = user.getFree12().add(freeGold1); +// user.setFree12(free12); +// } +// +// System.out.println(user+"----------------------------------------------------------"); +// result = userMapper.update(user); if (result != 1) { throw new Exception("Failed to insert another entity"); } diff --git a/src/main/java/com/example/demo/sevice/AuditService.java b/src/main/java/com/example/demo/sevice/AuditService.java index 5133730..dfccdb7 100644 --- a/src/main/java/com/example/demo/sevice/AuditService.java +++ b/src/main/java/com/example/demo/sevice/AuditService.java @@ -11,6 +11,7 @@ import java.util.List; public interface AuditService { int add (Audit audit); int edit(Audit audit); + int goldedit(Audit audit) throws Exception; List search(Audit audit) ; PageInfo searchForPage(Integer pageNum, Integer pageSize, Audit audit); List searchForDetail(ConsumeDetail consumeDetail);