Merge branch 'sunjiabei/feature-20250725135225-金币三期' into milestone-20250727-金币重构三期

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");

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")

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);
 }

src/main/java/com/example/demo/service/bean/BeanAuditService.java

@@ -19,9 +19,9 @@ public interface BeanAuditService {
     //查找审核信息
     PageInfo<BeanAuditInfo> 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);
 }

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

src/main/resources/mapper/BeanAuditMapper.xml

@@ -69,14 +69,17 @@
 
     <update id="updateStatus1">
         update audit
-        set audit_status = 1
+        set audit_status = 1,
+        audit_name = #{auditName}
         where id = #{id}
     </update>
 
 
     <update id="updateStatus2">
         update audit
-        set audit_status = 2
+        set audit_status = 2,
+        audit_name = #{auditName},
+        reason = #{reason}
         where id = #{id}
     </update>