init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserAuthAuditController.java

@@ -13,6 +13,9 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.UserAuthAudit;
+import com.ruoyi.xq.dto.admin.common.AuditFailReq;
+import com.ruoyi.xq.dto.admin.userauth.UserAuthAuditAdminVo;
+import com.ruoyi.xq.dto.app.common.IdsReq;
 import com.ruoyi.xq.service.UserAuthAuditService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -41,8 +44,8 @@ public class UserAuthAuditController extends BaseController {
      */
     @SaCheckPermission("xq:userAuthAudit:list")
     @GetMapping("/list")
-    public TableDataInfo<UserAuthAudit> list(UserAuthAudit bo, PageQuery pageQuery) {
-        Page<UserAuthAudit> page = userAuthAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserAuthAuditAdminVo> list(UserAuthAuditAdminVo bo, PageQuery pageQuery) {
+        Page<UserAuthAuditAdminVo> page = userAuthAuditService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -93,4 +96,24 @@ public class UserAuthAuditController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(userAuthAuditService.removeBatchByIds(Arrays.asList(ids)));
     }
+
+
+
+    @SaCheckPermission("xq:userAuthAudit:edit")
+    @Log(title = "用户认证审核成功", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/audit/success")
+    public R<Void> auditSuccess(@RequestBody IdsReq bo) {
+        userAuthAuditService.auditSuccess(bo.getIds());
+        return R.ok();
+    }
+
+    @SaCheckPermission("xq:userAuthAudit:edit")
+    @Log(title = "用户认证审核失败", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/audit/fail")
+    public R<Void> auditFail(@RequestBody AuditFailReq bo) {
+        userAuthAuditService.auditFail(bo.getId(), bo.getAuditRemark());
+        return R.ok();
+    }
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserWithdrawController.java

@@ -13,6 +13,10 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.UserWithdraw;
+import com.ruoyi.xq.dto.admin.common.AuditFailReq;
+import com.ruoyi.xq.dto.admin.withdraw.UserWithdrawAdminVo;
+import com.ruoyi.xq.dto.admin.withdraw.WithdrawSuccessAdminReq;
+import com.ruoyi.xq.dto.app.common.IdsReq;
 import com.ruoyi.xq.service.UserWithdrawService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -41,8 +45,8 @@ public class UserWithdrawController extends BaseController {
      */
     @SaCheckPermission("xq:userWithdraw:list")
     @GetMapping("/list")
-    public TableDataInfo<UserWithdraw> list(UserWithdraw bo, PageQuery pageQuery) {
-        Page<UserWithdraw> page = userWithdrawService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserWithdrawAdminVo> list(UserWithdrawAdminVo bo, PageQuery pageQuery) {
+        Page<UserWithdrawAdminVo> page = userWithdrawService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -59,28 +63,25 @@ public class UserWithdrawController extends BaseController {
         return R.ok(userWithdrawService.getById(id));
     }
 
-    /**
-     * 新增用户提现审核
-     */
-    @SaCheckPermission("xq:userWithdraw:add")
-    @Log(title = "用户提现审核", businessType = BusinessType.INSERT)
+    @SaCheckPermission("xq:userWithdraw:edit")
+    @Log(title = "用户提现审核成功", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserWithdraw bo) {
-        return toAjax(userWithdrawService.save(bo));
+    @PostMapping("/audit/success")
+    public R<Void> auditSuccess(@RequestBody WithdrawSuccessAdminReq bo) {
+        userWithdrawService.auditSuccess(bo.getId(), bo.isAutoTrans());
+        return R.ok();
     }
 
-    /**
-     * 修改用户提现审核
-     */
     @SaCheckPermission("xq:userWithdraw:edit")
-    @Log(title = "用户提现审核", businessType = BusinessType.UPDATE)
+    @Log(title = "用户提现审核失败", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserWithdraw bo) {
-        return toAjax(userWithdrawService.updateById(bo));
+    @PostMapping("/audit/fail")
+    public R<Void> auditFail(@RequestBody AuditFailReq bo) {
+        userWithdrawService.auditFail(bo.getId(), bo.getAuditRemark());
+        return R.ok();
     }
 
+
     /**
      * 删除用户提现审核
      *

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import com.ruoyi.xq.domain.WithdrawSetting;
 import com.ruoyi.xq.dto.app.common.IdReq;
-import com.ruoyi.xq.dto.app.common.IdsReq;
 import com.ruoyi.xq.dto.app.setting.WithdrawSettingVo;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListAppVo;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListPageQuery;
@@ -27,7 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/withdraw")
 @Tag(name = "提现接口")
-public class WithdrawController {
+public class WithdrawAppController {
 
     @Autowired
     private WithdrawSettingService withdrawSettingService;
@@ -54,7 +53,7 @@ public class WithdrawController {
         return R.ok();
     }
 
-    @PostMapping("/logs/page")
+    @GetMapping("/logs/page")
     @Operation(summary = "提现记录")
     @Log(title = "申请记录", businessType = BusinessType.OTHER, isSaveDb = false)
     public R<List<WithdrawListAppVo>> logsPage(PageQuery pageQuery, WithdrawListPageQuery query){