diff --git a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java b/src/main/java/com/example/demo/controller/bean/BeanAuditController.java index 98f89bb..9d45ce8 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanAuditController.java @@ -58,8 +58,10 @@ public class BeanAuditController { @PostMapping("/status1") public Result updateStatus1(@RequestBody BeanAuditInfo beanAuditInfo) { try { - - return beanAuditService.updateStatus1(beanAuditInfo.getId()); + if (ObjectUtils.isEmpty(beanAuditInfo.getId())) { + return Result.error("id不能为空"); + } + return beanAuditService.updateStatus1(beanAuditInfo); } catch (Exception e) { e.printStackTrace(); return Result.error("更新失败,查看id"); @@ -69,7 +71,13 @@ public class BeanAuditController { @PostMapping("/status2") public Result updateStatus2(@RequestBody BeanAuditInfo beanAuditInfo) { try { - beanAuditService.updateStatus2(beanAuditInfo.getId()); + if (ObjectUtils.isEmpty(beanAuditInfo.getId())) { + return Result.error("id不能为空"); + } + if (ObjectUtils.isEmpty(beanAuditInfo.getReason())) { + return Result.error("审核意见不能为空"); + } + beanAuditService.updateStatus2(beanAuditInfo); return Result.success(); } catch (Exception e) { return Result.error("更新失败,查看id"); diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java index 32f8011..bed1057 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java @@ -30,6 +30,7 @@ public class BeanAuditInfo { private String remark; // 备注 private String submitName; // 提交人名称 private String auditName; // 审核人名称 + private String reason; // 审核意见 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java b/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java index 43aa277..2d0520e 100644 --- a/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java @@ -24,8 +24,8 @@ public interface BeanAuditMapper { BeanAuditInfo selectById(Long id); //根据id更新状态为1 - void updateStatus1(Long id); + void updateStatus1(BeanAuditInfo beanAuditInfo); //根据id更新状态为2 - void updateStatus2(Long id); + void updateStatus2(BeanAuditInfo beanAuditInfo); } diff --git a/src/main/java/com/example/demo/service/bean/BeanAuditService.java b/src/main/java/com/example/demo/service/bean/BeanAuditService.java index 54bb0f1..3571ea0 100644 --- a/src/main/java/com/example/demo/service/bean/BeanAuditService.java +++ b/src/main/java/com/example/demo/service/bean/BeanAuditService.java @@ -19,9 +19,9 @@ public interface BeanAuditService { //查找审核信息 PageInfo selectBy(Integer pageNum, Integer pageSize, BeanAuditInfo beanAuditInfo); - Result updateStatus1(Long id); + Result updateStatus1(BeanAuditInfo beanAuditInfo); - void updateStatus2(Long id); + void updateStatus2(BeanAuditInfo beanAuditInfo); GoldBean statsBean(BeanAuditInfo beanAuditInfo); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java index f7e5faa..40d84c5 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java @@ -54,8 +54,8 @@ public class BeanAuditServiceImpl implements BeanAuditService { @Transactional @Override - public Result updateStatus1(Long id) { - BeanAuditInfo beanAuditInfo = beanAuditMapper.selectById(id); + public Result updateStatus1(BeanAuditInfo info) { + BeanAuditInfo beanAuditInfo = beanAuditMapper.selectById(info.getId()); String jwcode = beanAuditInfo.getJwcode().toString(); String op = "recharge"; // 操作类型(根据实际业务定义,例如"recharge"表示充值) String content = beanAuditInfo.getRemark(); // 备注作为content参数 @@ -88,13 +88,13 @@ public class BeanAuditServiceImpl implements BeanAuditService { if (!response2.getStatusCode().is2xxSuccessful()) { return Result.error("付费远程接口调用失败,状态码:" + response2.getStatusCodeValue()); } - beanAuditMapper.updateStatus1(id); + beanAuditMapper.updateStatus1(info); return Result.success(); } @Override - public void updateStatus2(Long id) { - beanAuditMapper.updateStatus2(id); + public void updateStatus2(BeanAuditInfo beanAuditInfo) { + beanAuditMapper.updateStatus2(beanAuditInfo); } @Override diff --git a/src/main/resources/mapper/BeanAuditMapper.xml b/src/main/resources/mapper/BeanAuditMapper.xml index f2ea51d..3375009 100644 --- a/src/main/resources/mapper/BeanAuditMapper.xml +++ b/src/main/resources/mapper/BeanAuditMapper.xml @@ -69,14 +69,17 @@ update audit - set audit_status = 1 + set audit_status = 1, + audit_name = #{auditName} where id = #{id} update audit - set audit_status = 2 + set audit_status = 2, + audit_name = #{auditName}, + reason = #{reason} where id = #{id}