diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java index b14072a85..9ff79df27 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.shop.controller.admin.recharge.vo; import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -10,12 +9,6 @@ import java.time.LocalDateTime; @Data public class PromoterDrawExcelVO { - @ExcelProperty( "用户id") - private Long userId; - @ExcelProperty( "组织id") - private Long deptId; - @ExcelProperty( "商户id") - private Long tenantId; @ExcelProperty( "组织名称") private String deptName; @ExcelProperty( "组织结构名称") diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java index e75d140f4..6414a239b 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java @@ -6,7 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -29,7 +28,7 @@ public class PromoterDrawReqVO extends PageParam { @Schema(description = "成为推广员时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - - + @Schema(description = "排序1升序2降序") + private String sort; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index 2e1b71cae..7b8914900 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.system.api.tenant.TenantApi; import cn.iocoder.yudao.module.system.api.tenant.dto.TenantDTO; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -138,6 +139,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { @Override public PageResult findPromoterDrawPage(PromoterDrawReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + if (Objects.nonNull(pageReqVO.getSort())&& StringUtils.equals("2",pageReqVO.getSort())) { + pageReqVO.setSort(null); + } rechargeOrderMapper.findPromoterDrawPage(page, pageReqVO); List list = page.getRecords(); if (list != null && list.size() > 0) { diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml index eebeee2c6..04f4364cf 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml @@ -10,7 +10,8 @@ --> - SELECT x1.*, x2.order_count, @@ -65,30 +66,39 @@ cy_recharge_order b GROUP BY b.promoter_id - ) x2 ON x1.user_id = x2.user_id ORDER BY x2.total_amount DESC + ) x2 ON x1.user_id = x2.user_id + + + ORDER BY x2.total_amount ASC + + + ORDER BY x2.total_amount DESC + + - SELECT b.promoter_id AS user_id, - count( CASE b.paid = 1 WHEN 1 THEN 0 END) AS order_count, - sum( CASE WHEN b.paid = 1 THEN b.pay_price ELSE 0 END ) AS deal_amount, + count( CASE b.paid = 1 WHEN 1 THEN 0 END) AS order_count, + sum( CASE WHEN b.paid = 1 THEN b.pay_price ELSE 0 END ) AS deal_amount, sum( CASE WHEN b.paid IN ( 1, 2 ) THEN b.pay_price ELSE 0 END ) AS total_amount FROM cy_recharge_order b - - - and b.promoter_id in - - #{id} - - - + + + and b.promoter_id in + + #{id} + + + GROUP BY b.promoter_id - - select a.order_id, a.pay_serial_number, @@ -127,7 +137,8 @@ - select a.id, a.order_id,