This commit is contained in:
张良(004796)
2024-03-26 11:23:22 +08:00
parent 7d6bf7e2e2
commit 7c476f0e73
23 changed files with 221 additions and 35 deletions

View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -9,9 +8,10 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.WxTransData;
import com.ruoyi.xq.dto.admin.account.WxTransDataAdminVo;
import com.ruoyi.xq.dto.app.common.IdReq;
import com.ruoyi.xq.service.WxTransDataService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -40,8 +40,8 @@ public class WxTransDataController extends BaseController {
*/
@SaCheckPermission("xq:wxTransData:list")
@GetMapping("/list")
public TableDataInfo<WxTransData> list(WxTransData bo, PageQuery pageQuery) {
Page<WxTransData> page = wxTransDataService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<WxTransDataAdminVo> list(WxTransDataAdminVo bo, PageQuery pageQuery) {
Page<WxTransDataAdminVo> page = wxTransDataService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}
@@ -58,15 +58,21 @@ public class WxTransDataController extends BaseController {
}
/**
* 修改微信交换数据
*/
@SaCheckPermission("xq:wxTransData:edit")
@Log(title = "微信交换数据", businessType = BusinessType.UPDATE)
@Log(title = "后台管理接受微信交换数据", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WxTransData bo) {
return toAjax(wxTransDataService.updateById(bo));
@PostMapping("/allow")
public R<Void> allow(@RequestBody IdReq bo) {
return toAjax(wxTransDataService.allowAdmin(bo.getId()));
}
@SaCheckPermission("xq:wxTransData:edit")
@Log(title = "后台管理拒绝微信交换数据", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/notAllow")
public R<Void> notAllow(@RequestBody IdReq bo) {
return toAjax(wxTransDataService.notAllowAdmin(bo.getId()));
}
/**

View File

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.WxTransLog;
import com.ruoyi.xq.dto.admin.account.WxTransLogAdminVo;
import com.ruoyi.xq.service.WxTransLogService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -38,8 +39,8 @@ public class WxTransLogController extends BaseController {
*/
@SaCheckPermission("xq:wxTransLog:list")
@GetMapping("/list")
public TableDataInfo<WxTransLog> list(WxTransLog bo, PageQuery pageQuery) {
Page<WxTransLog> page = wxTransLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<WxTransLogAdminVo> list(WxTransLogAdminVo bo, PageQuery pageQuery) {
Page<WxTransLogAdminVo> page = wxTransLogService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -13,7 +12,7 @@ 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.WxTransOrder;
import com.ruoyi.xq.dto.admin.wxtrans.WxTransOrderAdminVo;
import com.ruoyi.xq.dto.admin.account.WxTransOrderAdminVo;
import com.ruoyi.xq.service.WxTransOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;

View File

@@ -83,6 +83,15 @@ public class AccountAppController {
return R.ok(result);
}
@PostMapping("/wxTrans/apply")
@Operation(summary = "处理交换微信")
@Log(title = "处理交换微信", businessType = BusinessType.OTHER, isSaveDb = false)
public R<Void> applyWxTrans(@RequestBody WxTransDataApplyReq req){
req.setUserId(LoginHelper.getUserId());
wxTransDataService.apply(req);
return R.ok();
}
@PostMapping("/wxTrans/star")
@Operation(summary = "发起交换微信")
@Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false)
@@ -92,6 +101,7 @@ public class AccountAppController {
return R.ok();
}
@GetMapping("/wxTrans/data/page")
@Operation(summary = "查询交换微信数据")
@Log(title = "发起交换微信", businessType = BusinessType.OTHER, isSaveDb = false)
@@ -111,4 +121,6 @@ public class AccountAppController {
}
}