1

phpcjl

2024-12-20 dfc407f461055dda8f724ab4a0c79887727a20bd

1

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java

@@ -5,6 +5,7 @@
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.account.vo.CommissionDetail;
import com.ruoyi.account.vo.CommissionStatistics;
import com.ruoyi.account.vo.WalletStatistics;
import com.ruoyi.account.vo.WalletStatisticsDetail;
@@ -101,5 +102,20 @@
        util.exportExcel(response, userPointList, "钱包统计");
    }

    /**
     * 分佣统计明细
     */
    @GetMapping("/commissionDetail")
    @ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
    public R<CommissionDetail> commissionDetail(@ApiParam("页码") @RequestParam Integer pageNum,
                                                @ApiParam("每一页数据大小") Integer pageSize,
                                                BalanceChangeRecord balanceChangeRecord) {



//        return R.ok(balanceChangeRecordService.pageList(balanceChangeRecord));
        return null;
    }


}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java

@@ -21,7 +21,6 @@
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.enums.PointChangeType;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -54,8 +53,6 @@
    private VipSettingService vipSettingService;
    @Resource
    private PointSettingService pointSettingService;
    @Resource
    private ShopClient shopClient;

    @Override
    public UserPointVO getUserPoint(Long userId) {
@@ -149,7 +146,6 @@
     * 获取可转赠积分
     * @param pointSetting 积分设置
     * @param appUser 用户
     * @return
     */
    private long getAdjustedPoint(PointSetting pointSetting, AppUser appUser) {
        if (pointSetting == null || appUser == null) {

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java

New file
@@ -0,0 +1,70 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(description = "分佣明细")
public class CommissionDetail {

    /**
     * 用户获得总分佣金额
     */
    @ApiModelProperty(value = "用户获得总分佣金额")
    private Double totalCommission;

    /**
     * 门店获得总服务费用总分佣金额
     */
    @ApiModelProperty(value = "门店获得总服务费用总分佣金额")
    private Double totalServiceFee;

    /**
     * 门店获得关联用户总分佣金额
     */
    @ApiModelProperty(value = "门店获得关联用户总分佣金额")
    private Double totalUserCommission;

    /**
     * 普通会员获得总分佣金额
     */
    @ApiModelProperty(value = "普通会员获得总分佣金额")
    private Double totalNormalCommission;

    /**
     * 黄金会员获得总分佣金额
     */
    @ApiModelProperty(value = "黄金会员获得总分佣金额")
    private Double totalGoldCommission;

    /**
     * 钻石会员获得总分佣金额
     */
    @ApiModelProperty(value = "钻石会员获得总分佣金额")
    private Double totalDiamondCommission;

    /**
     * 准代理获得总分佣金额
     */
    @ApiModelProperty(value = "准代理获得总分佣金额")
    private Double totalAgentCommission;

    /**
     * 代理获得总分佣金额
     */
    @ApiModelProperty(value = "代理获得总分佣金额")
    private Double totalSuperAgentCommission;

    /**
     * 总代获得总分佣金额
     */
    @ApiModelProperty(value = "总代获得总分佣金额")
    private Double totalTopAgentCommission;

    /**
     * 合伙人获得总分佣金额
     */
    @ApiModelProperty(value = "合伙人获得总分佣金额")
    private Double totalPartnerCommission;
}