zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 推广员提成信息查询和导出. 商城提成

pull/6/head^2
tangqian 2023-05-31 14:58:00 +08:00
parent 2741f1cefe
commit 85adfec0db
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawExcelVO.java
View File

@ -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( "组织结构名称")

1
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
View File

@ -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;

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -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<PromoterDrawVO> findPromoterDrawPage(PromoterDrawReqVO pageReqVO) {
Page<PromoterDrawVO> 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<PromoterDrawVO> list = page.getRecords();
if (list != null && list.size() > 0) {

10
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -67,12 +67,14 @@
GROUP BY
b.promoter_id
) x2 ON x1.user_id = x2.user_id
<if test="data.sort !=null and data.sort=1">
<choose>
<when test="data.sort !=null and data.sort!=''">
ORDER BY x2.total_amount ASC
</if>
<if test="data.sort !=null and data.sort=2">
</when>
<otherwise>
ORDER BY x2.total_amount DESC
</if>
</otherwise>
</choose>
</select>
<select id="findPromoterDrawCount"
resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.PromoterDrawVO">