Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-23 0381d6fdd6831eb0abdd8bdd90a4a6a7b6e9026c

Merge remote-tracking branch 'origin/master'

 aa.json

@@ -1,7 +1,7 @@

[
{
  "province": "",
  "city":"",
  "area": "",
  "vip": []
    "date": "2.1",
    "num1": 100,
    "num2": 200
}
]

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java

@@ -45,6 +45,9 @@
    @TableField("jump_type")
    private Integer jumpType;

    @TableField("content_type")
    private Integer contentType;

    @ApiModelProperty(value = "跳转内容")
    @TableField("content")
    private String content;

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

@@ -37,7 +37,9 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -641,15 +643,24 @@
        BigDecimal totalServiceFee = BigDecimal.ZERO;
        BigDecimal totalUserCommission = BigDecimal.ZERO;
        Map<Integer, BigDecimal> vipCommissions = new HashMap<>();
        Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new HashMap<>();

        for (AppUser appUser : appUserList) {
            totalCommission = totalCommission.add(Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO));
            totalServiceFee = totalServiceFee.add(Optional.ofNullable(appUser.getShopServiceFee()).orElse(BigDecimal.ZERO));
            totalUserCommission = totalUserCommission.add(Optional.ofNullable(appUser.getShopCommission()).orElse(BigDecimal.ZERO));
            BigDecimal distributionAmount = Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO);
            BigDecimal serviceFee = Optional.ofNullable(appUser.getShopServiceFee()).orElse(BigDecimal.ZERO);
            BigDecimal userCommission = Optional.ofNullable(appUser.getShopCommission()).orElse(BigDecimal.ZERO);

            totalCommission = totalCommission.add(distributionAmount);
            totalServiceFee = totalServiceFee.add(serviceFee);
            totalUserCommission = totalUserCommission.add(userCommission);

            Integer vipId = appUser.getVipId();
            if (vipId != null && vipId >= 1 && vipId <= 7) {
                vipCommissions.merge(vipId, Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO), BigDecimal::add);
                vipCommissions.merge(vipId, distributionAmount, BigDecimal::add);

                String dateKey = appUser.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
                        .merge(vipId, distributionAmount, BigDecimal::add);
            }
        }

@@ -666,9 +677,28 @@
        commissionDetail.setTotalTopAgentCommission(vipCommissions.getOrDefault(6, BigDecimal.ZERO));
        commissionDetail.setTotalPartnerCommission(vipCommissions.getOrDefault(7, BigDecimal.ZERO));

        List<CommissionDate> commissionDateList = dailyVipCommissions.entrySet().stream()
                .map(entry -> {
                    CommissionDate commissionDate = new CommissionDate();
                    commissionDate.setDate(entry.getKey());
                    Map<Integer, BigDecimal> dailyCommissions = entry.getValue();
                    commissionDate.setNormalCommission(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));
                    commissionDate.setGoldCommission(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));
                    commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));
                    commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));
                    commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));
                    commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
                    commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));
                    return commissionDate;
                })
                .collect(Collectors.toList());

        commissionDetail.setCommissionDateList(commissionDateList);

        return R.ok(commissionDetail);
    }



}


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

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

import lombok.Data;

import java.math.BigDecimal;

@Data
public class CommissionDate {
    /**
     * 日期
     */
    private String date;

    /**
     * 普通会员分佣
     */
    private BigDecimal normalCommission;

    /**
     * 黄金会员分佣
     */
    private BigDecimal goldCommission;

    /**
     * 钻石会员分佣
     */
    private BigDecimal diamondCommission;

    /**
     * 准代理分佣
     */
    private BigDecimal agentCommission;

    /**
     * 代理分佣
     */
    private BigDecimal superAgentCommission;

    /**
     * 合伙人分佣
     */
    private BigDecimal partnerCommission;

    /**
     * 用户分佣总金额
     */
    private BigDecimal totalCommission;
}

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

@@ -5,6 +5,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@ApiModel(description = "分佣明细")
@@ -69,4 +70,6 @@
     */
    @ApiModelProperty(value = "合伙人获得总分佣金额")
    private BigDecimal totalPartnerCommission;

    private List<CommissionDate> commissionDateList;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -26,8 +26,10 @@

import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -280,28 +282,39 @@

        List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
                .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
        Map<String, List<Order>> orderMap = orderList.stream()
                .collect(Collectors.groupingBy(o -> o.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));

        Map<String, Integer> serviceOrderMap = new HashMap<>();
        Map<String, Integer> singleOrderMap = new HashMap<>();
        Map<String, Integer> totalOrderMap = new HashMap<>();

        orderMap.forEach((date, orders) -> {
            long serviceCount = orders.stream().filter(o -> o.getOrderType() == 1).count();
            long singleCount = orders.stream().filter(o -> o.getOrderType() == 2).count();
            long totalCount = orders.size();
        Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));

            serviceOrderMap.put(date, (int) serviceCount);
            singleOrderMap.put(date, (int) singleCount);
            totalOrderMap.put(date, (int) totalCount);
        List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
        map.forEach((key, value) -> {
            int serviceTotal = 0;
            int singleTotal = 0;
            int total = 0;
            BigDecimal totalMoney = BigDecimal.ZERO;
            BigDecimal serviceTotalMoney = BigDecimal.ZERO;
            BigDecimal singleTotalMoney = BigDecimal.ZERO;
            OrderStatisticsDetail orderStatisticsDetail = new OrderStatisticsDetail();
            for (Order order : value) {
                if (order.getOrderType().equals(1)) {
                    serviceTotal++;
                    serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
                }else if (order.getOrderType().equals(2)){
                    singleTotal++;
                    singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
                }
                total++;
                totalMoney = totalMoney.add(order.getPaymentAmount());
            }
            orderStatisticsDetail.setDate(key);
            orderStatisticsDetail.setServiceTotal(serviceTotal);
            orderStatisticsDetail.setSingleTotal(singleTotal);
            orderStatisticsDetail.setTotal(total);
            orderStatisticsDetails.add(orderStatisticsDetail);
        });

        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
        orderStatistics.setServiceOrderMap(serviceOrderMap);
        orderStatistics.setSingleOrderMap(singleOrderMap);
        orderStatistics.setTotalOrderMap(totalOrderMap);

        orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
        return R.ok(orderStatistics);
    }


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatistics.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Data
@@ -46,15 +47,5 @@
    @ApiModelProperty(value = "单品类型订单总金额")
    private Double singleTotalMoney;

    /**
     * 服务类型订单数量map(key:日期，value:数量)
     */
    @ApiModelProperty(value = "服务类型订单数量map(key:日期，value:数量)")
    private Map<String, Integer> serviceOrderMap;

    @ApiModelProperty(value = "单品类型订单数量map(key:日期，value:数量)")
    private Map<String, Integer> singleOrderMap;

    @ApiModelProperty(value = "订单总数map(key:日期，value:数量)")
    private Map<String, Integer> totalOrderMap;
    private List<OrderStatisticsDetail> orderStatisticsDetailList;
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java

New file
@@ -0,0 +1,39 @@
package com.ruoyi.order.vo;

import lombok.Data;

import java.math.BigDecimal;

@Data
public class OrderStatisticsDetail {
    private String date;
    /**
     * 服务订单数量
     */
    private Integer serviceTotal;

    /**
     * 单品订单数量
     */
    private Integer singleTotal;

    /**
     * 订单总数量
     */
    private Integer total;

    /**
     * 订单总金额
     */
    private BigDecimal totalMoney;

    /**
     * 服务订单金额
     */
    private BigDecimal serviceTotalMoney;

    /**
     * 单品订单金额
     */
    private BigDecimal singleTotalMoney;
}