This commit is contained in:
77
2024-03-21 23:04:40 +08:00
parent 4dd60a74f5
commit d0b1f961e8
41 changed files with 1048 additions and 62 deletions

View File

@@ -13,6 +13,8 @@ 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.SysPush;
import com.ruoyi.xq.dto.admin.syspush.SysPushParams;
import com.ruoyi.xq.dto.app.common.IdReq;
import com.ruoyi.xq.service.SysPushService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -42,7 +44,7 @@ public class SysPushController extends BaseController {
@SaCheckPermission("xq:sysPush:list")
@GetMapping("/list")
public TableDataInfo<SysPush> list(SysPush bo, PageQuery pageQuery) {
Page<SysPush> page = sysPushService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
Page<SysPush> page = sysPushService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(SysPush::getCreateTime));
return TableDataInfo.build(page);
}
@@ -58,26 +60,31 @@ public class SysPushController extends BaseController {
return R.ok(sysPushService.getById(id));
}
/**
* 新增推送系统消息
*/
@SaCheckPermission("xq:sysPush:run")
@Log(title = "推送系统消息执行", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/run")
public R<Void> run(@RequestBody IdReq idRes) {
sysPushService.handStart(idRes.getId());
return R.ok();
}
@SaCheckPermission("xq:sysPush:close")
@Log(title = "取消定时系统消息执行", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/close")
public R<Void> close(@RequestBody IdReq idRes) {
sysPushService.closeSysPush(idRes.getId());
return R.ok();
}
@SaCheckPermission("xq:sysPush:add")
@Log(title = "推送系统消息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysPush bo) {
return toAjax(sysPushService.save(bo));
}
/**
* 修改推送系统消息
*/
@SaCheckPermission("xq:sysPush:edit")
@Log(title = "推送系统消息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPush bo) {
return toAjax(sysPushService.updateById(bo));
public R<Void> add(@RequestBody SysPushParams params) {
sysPushService.saveSysPush(params);
return R.ok();
}
/**

View File

@@ -14,6 +14,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateWxTransNumReq;
import com.ruoyi.xq.service.UserExtendService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -69,4 +70,13 @@ public class UserExtendController extends BaseController {
return R.ok();
}
@SaCheckPermission("xq:userExtend:edit")
@Log(title = "调整用户微信次数", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/updateWxTransNum")
public R<Void> updateWxTransNum(@RequestBody UpdateWxTransNumReq bo) {
userExtendService.updateWxTransNum(bo);
return R.ok();
}
}

View File

@@ -13,6 +13,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.service.WxTransOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +42,8 @@ public class WxTransOrderController extends BaseController {
*/
@SaCheckPermission("xq:wxTransOrder:list")
@GetMapping("/list")
public TableDataInfo<WxTransOrder> list(WxTransOrder bo, PageQuery pageQuery) {
Page<WxTransOrder> page = wxTransOrderService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<WxTransOrderAdminVo> list(WxTransOrderAdminVo bo, PageQuery pageQuery) {
Page<WxTransOrderAdminVo> page = wxTransOrderService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}