nnnn
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.ruoyi.cai.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaCheckRole;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.cai.domain.Union;
|
||||
@@ -57,6 +58,7 @@ public class UnionTotalController extends BaseController {
|
||||
|
||||
@Log(title = "刷新工会每日收益", businessType = BusinessType.DELETE)
|
||||
@GetMapping("/refreshData")
|
||||
@SaCheckRole("admin")
|
||||
public R<Void> refreshData(String date) {
|
||||
if(StringUtils.isBlank(date)){
|
||||
unionTotalService.refreshAll();
|
||||
@@ -69,6 +71,7 @@ public class UnionTotalController extends BaseController {
|
||||
|
||||
@Log(title = "刷新所有工会总收益")
|
||||
@GetMapping("/refreshAllUnion")
|
||||
@SaCheckRole("admin")
|
||||
public R<Void> refreshAllUnion() {
|
||||
unionTotalService.refreshUnionTotalAll();
|
||||
return R.ok();
|
||||
@@ -76,6 +79,7 @@ public class UnionTotalController extends BaseController {
|
||||
|
||||
@Log(title = "刷新指定工会总收益")
|
||||
@GetMapping("/refreshUnionTotal")
|
||||
@SaCheckRole("admin")
|
||||
public R<Void> refreshUnionTotal(Long unionId) {
|
||||
unionTotalService.refreshUnionTotal(unionId);
|
||||
return R.ok();
|
||||
|
||||
@@ -27,7 +27,7 @@ public class ProxyUserManager {
|
||||
|
||||
public IPage<OrderListDTO> orderLogList(String usercode,PageQuery pageQuery, OrderListDTO query){
|
||||
User user = getUser(usercode);
|
||||
return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getUsercode(), query);
|
||||
return consumeLogMapper.selectProxyUserOrderPage(pageQuery.build(),user.getId(), query);
|
||||
}
|
||||
|
||||
public IPage<BindUserListDTO> bindUserList(String userCode, PageQuery pageQuery, BindUserListDTO query) {
|
||||
@@ -37,7 +37,7 @@ public class ProxyUserManager {
|
||||
|
||||
public ProxyTotalDTO total(String userCode) {
|
||||
User user = getUser(userCode);
|
||||
BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getUsercode());
|
||||
BigDecimal priceSum = consumeLogMapper.sumProxyUserOrder(user.getId());
|
||||
Long userCount = userInviteMapper.countProxyBindUser(user.getId());
|
||||
ProxyTotalDTO proxyTotalDTO = new ProxyTotalDTO();
|
||||
proxyTotalDTO.setBindUserCount(userCount == null ? 0 : userCount);
|
||||
|
||||
@@ -16,8 +16,8 @@ import java.math.BigDecimal;
|
||||
*/
|
||||
public interface ConsumeLogMapper extends BaseMapper<ConsumeLog> {
|
||||
IPage<OrderListDTO> selectProxyUserOrderPage(@Param("page") IPage<OrderListDTO> page,
|
||||
@Param("proxyUserCode") String proxyUserCode,
|
||||
@Param("proxyUserId") Long proxyUserId,
|
||||
@Param("query") OrderListDTO query);
|
||||
|
||||
BigDecimal sumProxyUserOrder(@Param("userCode") String userCode);
|
||||
BigDecimal sumProxyUserOrder(@Param("userId") Long userId);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user