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({ "