feat: add dashboard and virtual pay enhancements
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
package com.ruoyi.web.controller.app;
|
||||
|
||||
import com.ruoyi.app.service.IAppDashboardService;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* 首页业务指标接口。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/app/dashboard")
|
||||
public class AppDashboardController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IAppDashboardService appDashboardService;
|
||||
|
||||
@PreAuthorize("@ss.hasAnyPermi('app:virtualOrder:list,app:order:list,system:user:list')")
|
||||
@GetMapping("/summary")
|
||||
public AjaxResult summary()
|
||||
{
|
||||
return success(appDashboardService.selectDashboardSummary());
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.framework.web.service.PermissionService;
|
||||
import com.ruoyi.system.mapper.SysUserMapper;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -46,6 +47,8 @@ public class AppIntegralRecordController extends BaseController
|
||||
private SysUserMapper sysUserMapper;
|
||||
@Resource
|
||||
private AppResourceMapper appResourceMapper;
|
||||
@Resource
|
||||
private PermissionService permissionService;
|
||||
@Autowired
|
||||
private IAppLotteryGoodsService appLotteryGoodsService;
|
||||
@Autowired
|
||||
@@ -54,14 +57,30 @@ public class AppIntegralRecordController extends BaseController
|
||||
/**
|
||||
* 查询积分记录列表
|
||||
*/
|
||||
@PreAuthorize("isAuthenticated()")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(AppIntegralRecord appIntegralRecord)
|
||||
{
|
||||
startPage();
|
||||
if (!permissionService.hasPermi("app:appIntegra:list"))
|
||||
{
|
||||
return getDataTable(appIntegralRecordMapper.selectMyIntegralRecordList(getUserId()));
|
||||
}
|
||||
List<AppIntegralRecord> list = appIntegralRecordService.selectAppIntegralRecordList(appIntegralRecord);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 小程序“积分记录”,只查询当前登录用户的积分增减,不包含现金购买记录。
|
||||
*/
|
||||
@PreAuthorize("isAuthenticated()")
|
||||
@GetMapping("/my")
|
||||
public TableDataInfo myList()
|
||||
{
|
||||
startPage();
|
||||
return getDataTable(appIntegralRecordMapper.selectMyIntegralRecordList(getUserId()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出积分记录列表
|
||||
*/
|
||||
|
||||
@@ -6,11 +6,13 @@ import com.ruoyi.app.domain.request.CreateVirtualOrderRequest;
|
||||
import com.ruoyi.app.service.IAppVirtualPayService;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
@@ -44,6 +46,14 @@ public class AppVirtualPayController extends BaseController
|
||||
return success(virtualPayService.createOrder(request));
|
||||
}
|
||||
|
||||
@PreAuthorize("isAuthenticated()")
|
||||
@GetMapping("/resource-orders")
|
||||
public TableDataInfo listMyOrders()
|
||||
{
|
||||
startPage();
|
||||
return getDataTable(virtualPayService.listMyOrders());
|
||||
}
|
||||
|
||||
@PreAuthorize("isAuthenticated()")
|
||||
@GetMapping("/resource-orders/{orderNo}")
|
||||
public AjaxResult queryOrder(@PathVariable String orderNo,
|
||||
@@ -52,6 +62,14 @@ public class AppVirtualPayController extends BaseController
|
||||
return success(virtualPayService.queryOrder(orderNo, sync));
|
||||
}
|
||||
|
||||
@PreAuthorize("isAuthenticated()")
|
||||
@DeleteMapping("/resource-orders/{orderNo}")
|
||||
public AjaxResult cancelOrder(@PathVariable String orderNo)
|
||||
{
|
||||
virtualPayService.cancelOrder(orderNo);
|
||||
return success("订单已取消");
|
||||
}
|
||||
|
||||
/**
|
||||
* 在小程序后台保存消息推送配置时使用。
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user