分账fix

longz

2026-06-22 4c11fcb07ed8afc22bef4b26b72224e945d250db

分账fix

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java

@@ -24,6 +24,8 @@
    private Integer state;
    @ApiModelProperty("状态（1日结 2月结）")
    private Integer orderState;
    @ApiModelProperty("账户类型（1微信商户 2支付宝商户 3工商银行商户）")
    private Integer payType;
    @ApiModelProperty("uid 前端忽略")
    private String uid;


 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java

@@ -26,6 +26,10 @@
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "分佣")
    private BigDecimal sharingAmount;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "列表数据")
    private PageInfo<ChargingBillListVO> list;
    @ApiModelProperty(value = "导出数据")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java

@@ -37,6 +37,10 @@
    private BigDecimal serviceCharge;
    @ApiModelProperty(value = "平台手续费")
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "充电电流 度")
    private BigDecimal chargingCapacity;
    @ApiModelProperty(value = "入账金额")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java

@@ -30,6 +30,10 @@
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "三方平台分佣")
    private BigDecimal sharingAmount;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "优惠抵扣")
    private BigDecimal discount;
    @ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillWapper.java

@@ -31,6 +31,10 @@
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "三方平台分佣")
    private BigDecimal sharingAmount;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "优惠抵扣")
    private BigDecimal discount;
    @ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java

@@ -80,6 +80,10 @@
    private BigDecimal balanceIncome;
    @ApiModelProperty(value = "余额赠送收入")
    private BigDecimal balanceGiftIncome;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "充电后剩余金额")
    private BigDecimal residualAmount;
    @ApiModelProperty(value = "累计电费")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderTimeVO.java

@@ -23,6 +23,10 @@
    private BigDecimal electrovalence;
    @ApiModelProperty(value = "累计服务费")
    private BigDecimal serviceCharge;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "尖峰平谷充电量")
    private String capacityProportion;
    @ApiModelProperty(value = "尖峰平谷服务费")

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java

@@ -27,6 +27,10 @@
    private BigDecimal balanceIncome;
    @ApiModelProperty(value = "赠送费用")
    private BigDecimal balanceGiftIncome;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "白名单用户退款金额")
    private BigDecimal whitelistRefundAmount;


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java

@@ -337,8 +337,11 @@
        BigDecimal bigDecimal = new BigDecimal("0");

        for (TChargingOrder chargingOrder : collect) {
            bigDecimal = bigDecimal.add(chargingOrder.getRefundAmount());
            if (chargingOrder.getRechargePaymentType()!=null){
            bigDecimal = bigDecimal.add(chargingOrder.getRefundAmount() == null ? BigDecimal.ZERO : chargingOrder.getRefundAmount());
            if ("ICBC".equals(chargingOrder.getSourceName())) {
                chargingOrder.setPayPlatform("工商银行");
                chargingOrder.setRechargePaymentType1("工商银行支付");
            } else if (chargingOrder.getRechargePaymentType()!=null){
                switch (chargingOrder.getRechargePaymentType()){
                    case 1:
                        chargingOrder.setPayPlatform("微信");
@@ -348,12 +351,18 @@
                        chargingOrder.setPayPlatform("支付宝");
                        chargingOrder.setRechargePaymentType1("支付宝小程序支付");
                        break;
                    case 3:
                        chargingOrder.setPayPlatform("支付宝");
                        chargingOrder.setRechargePaymentType1("支付宝H5支付");
                        break;
                }
            }
            chargingOrder.setXuhao(i);
            i++;
        }
        collect.get(0).setTotal(bigDecimal);
        if (!collect.isEmpty()) {
            collect.get(0).setTotal(bigDecimal);
        }
        try {
            response.setCharacterEncoding(Constants.UTF8);
            response.setContentType("application/vnd.ms-excel");

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

@@ -154,6 +154,8 @@
        accountListVO.setRefundAmount(res.getRefundAmount().setScale(2, BigDecimal.ROUND_DOWN));
        accountListVO.setCommissionAmount(res.getCommissionAmount().setScale(2, BigDecimal.ROUND_DOWN));
        accountListVO.setSharingAmount(res.getSharingAmount().setScale(2, BigDecimal.ROUND_DOWN));
        accountListVO.setPlatformIncome(res.getPlatformIncome().setScale(2, BigDecimal.ROUND_DOWN));
        accountListVO.setPartnerIncome(res.getPartnerIncome().setScale(2, BigDecimal.ROUND_DOWN));
        accountListVO.setList(res.getList());
        accountListVO.setOrderList(res.getExportList());
        return R.ok(accountListVO);
@@ -203,6 +205,8 @@
            tChargingBillExport.setBillWeek(orderInvoiceVO.getBillWeek());
            tChargingBillExport.setSiteName(orderInvoiceVO.getSiteName());
            tChargingBillExport.setPaymentAmount(orderInvoiceVO.getPaymentAmount());
            tChargingBillExport.setPlatformIncome(orderInvoiceVO.getPlatformIncome());
            tChargingBillExport.setPartnerIncome(orderInvoiceVO.getPartnerIncome());
            tChargingBillExport.setElectrovalence(orderInvoiceVO.getElectrovalence());
            tChargingBillExport.setServiceCharge(orderInvoiceVO.getServiceCharge());
            tChargingBillExport.setChargingCapacity(orderInvoiceVO.getChargingCapacity());
@@ -276,6 +280,8 @@
            tChargingBillExport.setBillWeek(orderInvoiceVO.getBillWeek());
            tChargingBillExport.setSiteName(orderInvoiceVO.getSiteName());
            tChargingBillExport.setPaymentAmount(orderInvoiceVO.getPaymentAmount());
            tChargingBillExport.setPlatformIncome(orderInvoiceVO.getPlatformIncome());
            tChargingBillExport.setPartnerIncome(orderInvoiceVO.getPartnerIncome());
            tChargingBillExport.setElectrovalence(orderInvoiceVO.getElectrovalence());
            tChargingBillExport.setServiceCharge(orderInvoiceVO.getServiceCharge());
            tChargingBillExport.setChargingCapacity(orderInvoiceVO.getChargingCapacity());

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

@@ -250,6 +250,8 @@
            }
            tChargingOrderExport.setBalanceIncome(formatMoney(chargingOrderListVO.getBalanceIncome()));
            tChargingOrderExport.setBalanceGiftIncome(formatMoney(chargingOrderListVO.getBalanceGiftIncome()));
            tChargingOrderExport.setPlatformIncome(formatMoney(chargingOrderListVO.getPlatformIncome()));
            tChargingOrderExport.setPartnerIncome(formatMoney(chargingOrderListVO.getPartnerIncome()));
            tChargingOrderExport.setTripartiteCommission(formatMoney(chargingOrderListVO.getSharingAmount()));
            tChargingOrderExport.setOrderCode(chargingOrderListVO.getStartChargeSeq());
            tChargingOrderExport.setIsSingle("是");

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

@@ -931,11 +931,12 @@
    public R<List<SixChargingDto>> charge(Integer siteId) {
        Long userId = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userId).getData();
        boolean partnerView = isPartnerView(sysUser);
        List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
        LocalDate sixBefore = PreviousSixMonths.get();
        //通过siteIds进行sql查询统计
        List<SixChargingDto> sixChargingDtos = generateLastSixMonths();
        List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds);
        List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds, partnerView);
        for (SixChargingDto sixChargingDto : sixChargingDtos) {
            for (SixChargingDto chargingDto : chargingDtos) {
                if (sixChargingDto.getMonth().equals(chargingDto.getMonth())){
@@ -973,9 +974,10 @@
    public R<List<SixCircleDto>> circle() {
        Long userId = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userId).getData();
        boolean partnerView = isPartnerView(sysUser);
        List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
        LocalDate sixBefore = PreviousSixMonths.get();
        List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
        List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore, partnerView);
        for (SixCircleDto sixCircleDto : sixCircleDtos) {
            Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
            sixCircleDto.setSiteName(site.getName());
@@ -1060,14 +1062,15 @@
        //count近6个月的数据
        Long userId = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userId).getData();
        boolean partnerView = isPartnerView(sysUser);
        List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
        Map<String,Object>  map = chargingOrderService.countAll(siteIds);
        boolean platformVisible = 1 == sysUser.getObjectId();
        Map<String,Object>  map = chargingOrderService.countAll(siteIds, partnerView);
        if (map == null) {
            map = new HashMap<String,Object>();
        }
        boolean platformVisible = !partnerView;
        if(platformVisible){
            BigDecimal data = parkingLotClient.getRecordAmount().getData();
            if (map ==null){
                map = new HashMap<String,Object>();
            }
            map.put("parkingAmount",data);
            BigDecimal data1 =   shoppingOrderService.getSumAmount();
            map.put("shopAmount",data1);
@@ -1089,9 +1092,14 @@
    public R<List<SixIncomeCircleDto>> payTypeCircle() {
        Long userId = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userId).getData();
        boolean partnerView = isPartnerView(sysUser);
        List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
        LocalDate sixBefore = PreviousSixMonths.get();
        return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds));
        return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds, partnerView));
    }

    private boolean isPartnerView(SysUser sysUser) {
        return sysUser != null && Integer.valueOf(2).equals(sysUser.getRoleType());
    }

    /**

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingBillExport.java

@@ -24,6 +24,10 @@
    private String siteName;
    @Excel(name  = "总金额",width = 30)
    private BigDecimal paymentAmount;
    @Excel(name  = "平台收入",width = 30)
    private BigDecimal platformIncome;
    @Excel(name  = "合作商收入",width = 30)
    private BigDecimal partnerIncome;
    @Excel(name  = "总电费",width = 30)
    private BigDecimal electrovalence;
    @Excel(name  = "总服务费",width = 30)

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java

@@ -96,6 +96,10 @@
    private String balanceIncome;
    @Excel(name = "余额赠送收入",width = 30)
    private String balanceGiftIncome;
    @Excel(name = "平台收入",width = 30)
    private String platformIncome;
    @Excel(name = "合作商收入",width = 30)
    private String partnerIncome;
    @Excel(name = "引流平台分佣",width = 30)
    private String tripartiteCommission;
    @Excel(name = "车架号来源",width = 30)

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -65,6 +65,8 @@
    Map<String, Object> exchangeCodeBalanceSummary(@Param("orderIds") List<Long> orderIds);
    List<Map<String, Object>> exchangeCodeBalanceIncomeByOrderIds(@Param("orderIds") List<Long> orderIds);
    List<ChargingOrderBalanceIncomeDetailVO> exchangeCodeBalanceIncomeDetail(@Param("orderIds") List<Long> orderIds);
    List<Map<String, Object>> chargingOrderShareIncomeByOrderIds(@Param("orderIds") List<Long> orderIds);
    Map<String, Object> chargingOrderShareIncomeSummaryByOrderIds(@Param("orderIds") List<Long> orderIds);

    List<PayOrderDto> payOrderQuery(@Param("pageInfo")PageInfo<PayOrderDto> pageInfo,@Param("data") PayOrderQueryDto payOrderQueryDto);

@@ -72,11 +74,12 @@

    List<ChargingOrderGroup> chargingOrderGroup(@Param("chargingPercentProvinceDto")ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> charge(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds);
    List<SixChargingDto> charge(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds, @Param("partnerView") Boolean partnerView);

    List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore);
    List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore, @Param("partnerView") Boolean partnerView);

    Map<String, Object> countAll(@Param("siteIds")List<Integer> siteIds);
    Map<String, Object> countAll(@Param("siteIds")List<Integer> siteIds, @Param("partnerView") Boolean partnerView);
    List<Map<String, Object>> chargingOrderShareIncomeByPayChannel(@Param("sixBefore")LocalDate sixBefore,@Param("siteIds") List<Integer> siteIds);

    List<Map<String, Object>> getSumByType(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds);


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -152,13 +152,13 @@

    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);

    List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds);
    List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds, Boolean partnerView);

    List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
    List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore, Boolean partnerView);

    Map<String, Object> countAll(List<Integer> siteIds);
    Map<String, Object> countAll(List<Integer> siteIds, Boolean partnerView);

    List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds);
    List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds, Boolean partnerView);

    List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java

@@ -10,9 +10,11 @@
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
@@ -31,10 +33,13 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -151,9 +156,12 @@
        BigDecimal serviceChargeTotal = new BigDecimal("0");
        BigDecimal commissionAmountTotal = new BigDecimal("0");
        BigDecimal sharingAmountTotal = new BigDecimal("0");
        BigDecimal platformIncomeTotal = new BigDecimal("0");
        BigDecimal partnerIncomeTotal = new BigDecimal("0");
        BigDecimal chargingCapacityTotal = new BigDecimal("0");
        BigDecimal discountTotal = new BigDecimal("0");
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();


        for (ChargingBillListVO chargingBillListVO : list) {
@@ -209,6 +217,8 @@
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }
            tChargingOrders = filterAccountSettlementOrders(tChargingOrders, chargingBillListVO.getPayType());
            chargingBillListVO.setPayTypeName(resolveAccountPayTypeName(chargingBillListVO.getPayType(), tChargingOrders));



@@ -235,16 +245,6 @@
                if (data1!=null && data2!=null){
                    tChargingOrder.setTerminalName(data1.getName()+data2.getName());
                    tChargingOrder.setTerminalCode(data2.getCode());
                }
                if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
                    chargingBillListVO.setPayTypeName("微信商户");
                }
                if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
                    if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
                        chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
                    }else{
                        chargingBillListVO.setPayTypeName("支付宝商户");
                    }
                }
                tChargingOrder.setOrderClassification1("线上订单");
                tChargingOrder.setRechargePaymentType1("预付");
@@ -393,6 +393,10 @@
            chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
            chargingBillListVO.setBillMoney(paymentAmount
                            .subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            chargingBillListVO.setPlatformIncome(incomeMap.get("platformIncome"));
            chargingBillListVO.setPartnerIncome(incomeMap.get("partnerIncome"));
            switch (chargingBillListVO.getType()){
                case 1:
                    chargingBillListVO.setSiteName("全站");
@@ -447,6 +451,7 @@
                tChargingOrders = total.stream().filter(e ->  e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
                        && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
            }
            tChargingOrders = filterAccountSettlementOrders(tChargingOrders, chargingBillListVO.getPayType());
            for (TChargingOrder tChargingOrder : tChargingOrders) {
                List<TChargingOrderAccountingStrategy> list4 = list3.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
                BigDecimal electronic_reduce = list4.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -498,6 +503,10 @@
                    discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount());
                }
            }
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            platformIncomeTotal = platformIncomeTotal.add(incomeMap.get("platformIncome"));
            partnerIncomeTotal = partnerIncomeTotal.add(incomeMap.get("partnerIncome"));
            tChargingOrders1.addAll(tChargingOrders);
            chargingBillVO.setExportList(tChargingOrders);
        }
@@ -509,6 +518,8 @@
        chargingBillVO.setServiceCharge(serviceChargeTotal);
        chargingBillVO.setCommissionAmount(commissionAmountTotal);
        chargingBillVO.setSharingAmount(sharingAmountTotal);
        chargingBillVO.setPlatformIncome(platformIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setPartnerIncome(partnerIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setDiscount(discountTotal);
        chargingBillVO.setRefundAmount(refundAmountTotal);
        List<TChargingOrder> collect = tChargingOrders1.stream().distinct().collect(Collectors.toList());
@@ -547,6 +558,7 @@
        List<TAppUser> userList = appUserClient.getAllUser().getData();
        List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();

        Long userId = tokenService.getLoginUser().getUserid();
        // 查询当前登陆人按钮权限
@@ -598,6 +610,8 @@
        BigDecimal serviceChargeTotal = new BigDecimal("0");
        BigDecimal commissionAmountTotal = new BigDecimal("0");
        BigDecimal sharingAmountTotal = new BigDecimal("0");
        BigDecimal platformIncomeTotal = new BigDecimal("0");
        BigDecimal partnerIncomeTotal = new BigDecimal("0");
        BigDecimal chargingCapacityTotal = new BigDecimal("0");
        BigDecimal discountTotal = new BigDecimal("0");
        BigDecimal refundAmountTotal = new BigDecimal("0");
@@ -858,6 +872,10 @@
            chargingBillListVO.setOrderCount(tChargingOrders.size());
            // 充电时间秒
            chargingBillListVO.setChargingSecond(chargingSecond);
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            chargingBillListVO.setPlatformIncome(incomeMap.get("platformIncome"));
            chargingBillListVO.setPartnerIncome(incomeMap.get("partnerIncome"));
        }
        for (ChargingBillListVO chargingBillListVO : list1) {
            if (dto.getType() == 1){
@@ -965,6 +983,10 @@
                    discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount());
                }
            }
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            platformIncomeTotal = platformIncomeTotal.add(incomeMap.get("platformIncome"));
            partnerIncomeTotal = partnerIncomeTotal.add(incomeMap.get("partnerIncome"));
        }
        chargingBillVO.setChargingCapacity(chargingCapacityTotal);
        chargingBillVO.setPaymentAmount(paymentAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, BigDecimal.ROUND_DOWN));
@@ -974,6 +996,8 @@
        chargingBillVO.setOrderCount(orderCount);
        chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setPlatformIncome(platformIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setPartnerIncome(partnerIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setDiscount(discountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        pageInfo.setRecords(chargingBillListVOS);
        chargingBillVO.setList(pageInfo);
@@ -1033,6 +1057,10 @@
        List<Map<String, Object>> list = chargingSettlementBillService.queryList(pageInfo, dto.getType(), dto.getState(), dto.getDateRange(), statisticalDateType, dto.getSiteIds());
        ChargingBillWapper chargingBillVO = new ChargingBillWapper();
        List<Map<String, Object>> pageList = new ArrayList<>();
        List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class)
                .isNotNull(TChargingOrder::getPayTime));
        List<TChargingOrderAccountingStrategy> strategyList = chargingOrderAccountingStrategyService.list();
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();
        if(null != list){
            for (Map<String, Object> map : list) {
                Integer site_id = Integer.valueOf(map.get("site_id").toString());
@@ -1049,6 +1077,7 @@
                String chargingCapacity = map.get("total_electricity").toString();
                String electrovalence = map.get("total_electricity_charge").toString();
                String serviceCharge = map.get("total_service_fee").toString();
                Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(dto.getType(), site_id, billingCycle, total, strategyList, siteServiceShareRatioMap);
                Map<String, Object> data1 = new HashMap<>();
                data1.put("code", code);
                data1.put("orderState", 2);
@@ -1062,6 +1091,8 @@
                data1.put("commissionAmount", commissionAmount);
                data1.put("sharingAmount", sharingAmount);
                data1.put("paymentAmount", paymentAmount);
                data1.put("platformIncome", incomeMap.get("platformIncome"));
                data1.put("partnerIncome", incomeMap.get("partnerIncome"));
                data1.put("chargingCapacity", chargingCapacity);
                data1.put("electrovalence", electrovalence);
                data1.put("serviceCharge", serviceCharge);
@@ -1085,6 +1116,19 @@
        BigDecimal commissionAmount = (null == map || null == map.get("platformFee")) ? BigDecimal.ZERO : new BigDecimal(map.get("platformFee").toString());
        BigDecimal sharingAmount = (null == map || null == map.get("tripartiteCommission")) ? BigDecimal.ZERO : new BigDecimal(map.get("tripartiteCommission").toString());
        BigDecimal discount = (null == map || null == map.get("couponDeduction")) ? BigDecimal.ZERO : new BigDecimal(map.get("couponDeduction").toString());
        BigDecimal platformIncome = BigDecimal.ZERO;
        BigDecimal partnerIncome = BigDecimal.ZERO;
        PageInfo<Map<String, Object>> sumPageInfo = new PageInfo<>(1, 100000);
        List<Map<String, Object>> sumList = chargingSettlementBillService.queryList(sumPageInfo, dto.getType(), dto.getState(), dto.getDateRange(), statisticalDateType, dto.getSiteIds());
        if (sumList != null) {
            for (Map<String, Object> row : sumList) {
                Integer siteId = Integer.valueOf(row.get("site_id").toString());
                String billingCycle = row.get("billingCycle").toString();
                Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(dto.getType(), siteId, billingCycle, total, strategyList, siteServiceShareRatioMap);
                platformIncome = platformIncome.add(incomeMap.get("platformIncome"));
                partnerIncome = partnerIncome.add(incomeMap.get("partnerIncome"));
            }
        }
        chargingBillVO.setChargingCapacity(chargingCapacity);
        chargingBillVO.setPaymentAmount(paymentAmount.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setOrderAmount(orderAmount.setScale(2, BigDecimal.ROUND_DOWN));
@@ -1093,6 +1137,8 @@
        chargingBillVO.setOrderCount(orderCount);
        chargingBillVO.setCommissionAmount(commissionAmount.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setSharingAmount(sharingAmount.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setPlatformIncome(platformIncome.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setPartnerIncome(partnerIncome.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setDiscount(discount.setScale(2, BigDecimal.ROUND_DOWN));
        pageInfo.setRecords(pageList);
        chargingBillVO.setList(pageInfo);
@@ -1125,6 +1171,7 @@
        List<TAppUser> userList = appUserClient.getAllUser().getData();
        List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
        List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();

        Long userId = tokenService.getLoginUser().getUserid();
        // 查询当前登陆人按钮权限
@@ -1176,6 +1223,8 @@
        BigDecimal serviceChargeTotal = new BigDecimal("0");
        BigDecimal commissionAmountTotal = new BigDecimal("0");
        BigDecimal sharingAmountTotal = new BigDecimal("0");
        BigDecimal platformIncomeTotal = new BigDecimal("0");
        BigDecimal partnerIncomeTotal = new BigDecimal("0");
        BigDecimal chargingCapacityTotal = new BigDecimal("0");
        BigDecimal discountTotal = new BigDecimal("0");
        BigDecimal refundAmountTotal = new BigDecimal("0");
@@ -1436,6 +1485,10 @@
            chargingBillListVO.setOrderCount(tChargingOrders.size());
            // 充电时间秒
            chargingBillListVO.setChargingSecond(chargingSecond);
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            chargingBillListVO.setPlatformIncome(incomeMap.get("platformIncome"));
            chargingBillListVO.setPartnerIncome(incomeMap.get("partnerIncome"));
        }
        for (ChargingBillListVO chargingBillListVO : list1) {
            if (dto.getType() == 1){
@@ -1543,6 +1596,10 @@
                    discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount());
                }
            }
            Map<String, BigDecimal> incomeMap = calculateChargingBillIncome(chargingBillListVO.getType(), chargingBillListVO.getSiteId(),
                    chargingBillListVO.getBillWeek(), tChargingOrders, list3, siteServiceShareRatioMap);
            platformIncomeTotal = platformIncomeTotal.add(incomeMap.get("platformIncome"));
            partnerIncomeTotal = partnerIncomeTotal.add(incomeMap.get("partnerIncome"));
        }
        chargingBillVO.setChargingCapacity(chargingCapacityTotal);
        chargingBillVO.setPaymentAmount(paymentAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, BigDecimal.ROUND_DOWN));
@@ -1552,12 +1609,160 @@
        chargingBillVO.setOrderCount(orderCount);
        chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        chargingBillVO.setPlatformIncome(platformIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setPartnerIncome(partnerIncomeTotal.setScale(2, RoundingMode.HALF_UP));
        chargingBillVO.setDiscount(discountTotal.setScale(2, BigDecimal.ROUND_DOWN));
        pageInfo.setRecords(chargingBillListVOS);
        chargingBillVO.setList(pageInfo);
        return chargingBillVO;
    }

    private Map<String, BigDecimal> calculateChargingBillIncome(Integer billType, Integer billSiteId, String billingCycle,
                                                                List<TChargingOrder> allOrders,
                                                                List<TChargingOrderAccountingStrategy> allStrategies,
                                                                Map<Integer, BigDecimal> siteServiceShareRatioMap) {
        Map<String, BigDecimal> incomeMap = new HashMap<>();
        BigDecimal platformIncome = BigDecimal.ZERO;
        BigDecimal partnerIncome = BigDecimal.ZERO;
        if (!StringUtils.hasLength(billingCycle) || allOrders == null || allOrders.isEmpty()) {
            incomeMap.put("platformIncome", platformIncome);
            incomeMap.put("partnerIncome", partnerIncome);
            return incomeMap;
        }

        LocalDate billMonth = LocalDate.parse(billingCycle + "-01");
        LocalDateTime firstDayOfMonth = billMonth.withDayOfMonth(1).atStartOfDay();
        LocalDateTime lastDayOfMonth = billMonth.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
        List<TChargingOrderAccountingStrategy> strategies = allStrategies == null ? Collections.emptyList() : allStrategies;
        for (TChargingOrder order : allOrders) {
            if (order == null || order.getPayTime() == null) {
                continue;
            }
            if (billType != null && billType == 2 && !billSiteId.equals(order.getSiteId())) {
                continue;
            }
            if (order.getPayTime().isBefore(firstDayOfMonth) || order.getPayTime().isAfter(lastDayOfMonth)) {
                continue;
            }
            List<TChargingOrderAccountingStrategy> orderStrategies = strategies.stream()
                    .filter(strategy -> strategy.getChargingOrderId().equals(order.getId()))
                    .collect(Collectors.toList());
            BigDecimal electronicReduce = orderStrategies.stream()
                    .map(TChargingOrderAccountingStrategy::getPeriodElectricPrice)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal serviceReduce = orderStrategies.stream()
                    .map(TChargingOrderAccountingStrategy::getPeriodServicePrice)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal paymentAmount;
            if (Integer.valueOf(2).equals(order.getOrderSource())) {
                paymentAmount = electronicReduce.add(serviceReduce.multiply(new BigDecimal("0.8")).setScale(2, RoundingMode.DOWN));
            } else {
                paymentAmount = electronicReduce.add(serviceReduce);
                if (Integer.valueOf(1).equals(order.getOrderSource())) {
                    BigDecimal serviceShareRatio = siteServiceShareRatioMap.get(order.getSiteId());
                    if (serviceShareRatio != null && serviceShareRatio.compareTo(BigDecimal.ZERO) > 0) {
                        partnerIncome = partnerIncome.add(serviceReduce.multiply(serviceShareRatio).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
                    }
                }
            }
            platformIncome = platformIncome.add(paymentAmount);
        }
        platformIncome = platformIncome.subtract(partnerIncome).max(BigDecimal.ZERO);
        incomeMap.put("platformIncome", platformIncome.setScale(2, RoundingMode.HALF_UP));
        incomeMap.put("partnerIncome", partnerIncome.setScale(2, RoundingMode.HALF_UP));
        return incomeMap;
    }

    private List<TChargingOrder> filterAccountSettlementOrders(List<TChargingOrder> orders, Integer payType) {
        if (orders == null || orders.isEmpty() || payType == null || payType == 0) {
            return orders == null ? Collections.emptyList() : orders;
        }
        return orders.stream()
                .filter(order -> accountSettlementOrderMatches(order, payType))
                .collect(Collectors.toList());
    }

    private boolean accountSettlementOrderMatches(TChargingOrder order, Integer payType) {
        if (order == null || payType == null) {
            return true;
        }
        if (payType == 1) {
            return !isIcbcOrder(order) && Integer.valueOf(1).equals(order.getRechargePaymentType());
        }
        if (payType == 2) {
            return !isIcbcOrder(order) && (Integer.valueOf(2).equals(order.getRechargePaymentType()) || Integer.valueOf(3).equals(order.getRechargePaymentType()));
        }
        if (payType == 3) {
            return isIcbcOrder(order) && Integer.valueOf(1).equals(order.getOrderSource());
        }
        return true;
    }

    private String resolveAccountPayTypeName(Integer payType, List<TChargingOrder> orders) {
        if (payType != null && payType != 0) {
            switch (payType) {
                case 1:
                    return "微信商户";
                case 2:
                    return "支付宝商户";
                case 3:
                    return "工商银行商户";
                default:
                    break;
            }
        }
        boolean hasWx = false;
        boolean hasAli = false;
        boolean hasIcbc = false;
        if (orders != null) {
            for (TChargingOrder order : orders) {
                if (isIcbcOrder(order)) {
                    hasIcbc = true;
                } else if (Integer.valueOf(1).equals(order.getRechargePaymentType())) {
                    hasWx = true;
                } else if (Integer.valueOf(2).equals(order.getRechargePaymentType()) || Integer.valueOf(3).equals(order.getRechargePaymentType())) {
                    hasAli = true;
                }
            }
        }
        List<String> names = new ArrayList<>();
        if (hasWx) {
            names.add("微信商户");
        }
        if (hasAli) {
            names.add("支付宝商户");
        }
        if (hasIcbc) {
            names.add("工商银行商户");
        }
        return names.isEmpty() ? "" : String.join("+", names);
    }

    private boolean isIcbcOrder(TChargingOrder order) {
        return order != null && "ICBC".equals(order.getSourceName());
    }

    private Map<Integer, BigDecimal> loadSiteServiceShareRatioMap() {
        Map<Integer, BigDecimal> ratioMap = new HashMap<>();
        R<List<Site>> siteResult = siteClient.getSiteAll();
        R<List<Partner>> partnerResult = siteClient.getAllPartner();
        List<Site> sites = siteResult == null ? Collections.emptyList() : siteResult.getData();
        List<Partner> partners = partnerResult == null ? Collections.emptyList() : partnerResult.getData();
        if (sites == null || sites.isEmpty() || partners == null || partners.isEmpty()) {
            return ratioMap;
        }
        Map<Integer, Partner> partnerMap = partners.stream()
                .filter(partner -> partner != null && partner.getId() != null)
                .collect(Collectors.toMap(Partner::getId, partner -> partner, (left, right) -> left));
        for (Site site : sites) {
            if (site == null || site.getId() == null || site.getPartnerId() == null) {
                continue;
            }
            Partner partner = partnerMap.get(site.getPartnerId());
            if (partner != null && partner.getServiceShareRatio() != null) {
                ratioMap.put(site.getId(), partner.getServiceShareRatio());
            }
        }
        return ratioMap;
    }
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1955,6 +1955,7 @@
            List<Integer> siteIds = dto.getSiteIds();
            List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo, dto, startTime1, startTime2, endTime1, endTime2);
            fillChargingOrderBalanceIncome(list);
            fillChargingOrderShareIncome(list);
            List<TChargingOrderAccountingStrategy> list3 = chargingOrderAccountingStrategyService.list();
        for (ChargingOrderVO chargingOrderVO : list) {
            if (roleType == 2) {
@@ -2030,13 +2031,14 @@
        }
        Map<String, Object> fundMap = this.baseMapper.chargingOrderFundSummary(dto, startTime1, startTime2, endTime1, endTime2);
        if (null != fundMap) {
            tCharingOrderVO.setPlatformIncomeTotal(getSummaryDecimal(fundMap, "platformIncomeTotal"));
            tCharingOrderVO.setPartnerIncomeTotal(getSummaryDecimal(fundMap, "partnerIncomeTotal"));
            tCharingOrderVO.setWechatIncome(getSummaryDecimal(fundMap, "wechatIncome"));
            tCharingOrderVO.setAlipayIncome(getSummaryDecimal(fundMap, "alipayIncome"));
            tCharingOrderVO.setWhitelistChargingIncome(getSummaryDecimal(fundMap, "whitelistChargingIncome"));
            tCharingOrderVO.setWhitelistRefund(getSummaryDecimal(fundMap, "whitelistRefund"));
        }
        Map<String, Object> shareIncomeMap = getChargingOrderShareIncomeSummary(dto, startTime1, startTime2, endTime1, endTime2);
        tCharingOrderVO.setPlatformIncomeTotal(getSummaryDecimal(shareIncomeMap, "platformIncomeTotal"));
        tCharingOrderVO.setPartnerIncomeTotal(getSummaryDecimal(shareIncomeMap, "partnerIncomeTotal"));
        Map<String, Object> balanceMap = getExchangeCodeBalanceSummary(dto, startTime1, startTime2, endTime1, endTime2);
        tCharingOrderVO.setBalanceIncome(getSummaryDecimal(balanceMap, "balanceIncome"));
        tCharingOrderVO.setBalanceGiftIncome(getSummaryDecimal(balanceMap, "balanceGiftIncome"));
@@ -2217,6 +2219,30 @@
        return totalMap;
    }

    private Map<String, Object> getChargingOrderShareIncomeSummary(ChargingOrderQuery dto, String startTime1, String startTime2, String endTime1, String endTime2) {
        Map<String, Object> totalMap = new HashMap<>();
        totalMap.put("platformIncomeTotal", BigDecimal.ZERO);
        totalMap.put("partnerIncomeTotal", BigDecimal.ZERO);
        List<Long> orderIds = this.baseMapper.chargingOrderSummaryOrderIds(dto, startTime1, startTime2, endTime1, endTime2);
        if (orderIds == null || orderIds.isEmpty()) {
            return totalMap;
        }
        BigDecimal platformIncomeTotal = BigDecimal.ZERO;
        BigDecimal partnerIncomeTotal = BigDecimal.ZERO;
        int batchSize = 500;
        for (int i = 0; i < orderIds.size(); i += batchSize) {
            List<Long> batchIds = orderIds.subList(i, Math.min(i + batchSize, orderIds.size()));
            Map<String, Object> batchMap = this.baseMapper.chargingOrderShareIncomeSummaryByOrderIds(batchIds);
            if (batchMap != null) {
                platformIncomeTotal = platformIncomeTotal.add(getSummaryDecimal(batchMap, "platformIncomeTotal"));
                partnerIncomeTotal = partnerIncomeTotal.add(getSummaryDecimal(batchMap, "partnerIncomeTotal"));
            }
        }
        totalMap.put("platformIncomeTotal", platformIncomeTotal);
        totalMap.put("partnerIncomeTotal", partnerIncomeTotal);
        return totalMap;
    }

        private BigDecimal getSummaryDecimal(Map<String, Object> map, String key) {
            if (map == null) {
                return BigDecimal.ZERO;
@@ -2282,27 +2308,30 @@
    }
    
    @Override
    public List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds) {
        return this.baseMapper.charge(sixBefore, siteIds);
    public List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds, Boolean partnerView) {
        return this.baseMapper.charge(sixBefore, siteIds, partnerView);
    }
    
    @Override
    public List<SixCircleDto> circle(List<Integer> siteIds, LocalDate sixBefore) {
        return this.baseMapper.circle(siteIds, sixBefore);
    public List<SixCircleDto> circle(List<Integer> siteIds, LocalDate sixBefore, Boolean partnerView) {
        return this.baseMapper.circle(siteIds, sixBefore, partnerView);
    }
    
    @Override
    public Map<String, Object> countAll(List<Integer> siteIds) {
        return this.baseMapper.countAll(siteIds);
    public Map<String, Object> countAll(List<Integer> siteIds, Boolean partnerView) {
        return this.baseMapper.countAll(siteIds, partnerView);
    }

    /**
     * 统计近六月订单收入支付方式占比；服务层聚合避免复杂CASE SQL在当前数据库驱动中转换异常。
     */
    @Override
    public List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds) {
    public List<SixIncomeCircleDto> payTypeCircle(LocalDate sixBefore, List<Integer> siteIds, Boolean partnerView) {
        if (siteIds == null || siteIds.isEmpty()) {
            return buildPayTypeCircleData(BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO);
        }
        if (Boolean.TRUE.equals(partnerView)) {
            return buildPartnerShareCircleData(this.baseMapper.chargingOrderShareIncomeByPayChannel(sixBefore, siteIds));
        }
        List<TChargingOrder> orders = this.lambdaQuery()
                .select(TChargingOrder::getRechargePaymentType, TChargingOrder::getPayMethod,
@@ -2332,6 +2361,28 @@
            Integer payMethod = order.getPayMethod();
            if (Integer.valueOf(1).equals(payMethod) || Integer.valueOf(2).equals(payMethod)) {
                balanceAmount = balanceAmount.add(balancePayAmount);
            }
        }
        return buildPayTypeCircleData(wechatAmount, alipayAmount, balanceAmount);
    }

    private List<SixIncomeCircleDto> buildPartnerShareCircleData(List<Map<String, Object>> rows) {
        BigDecimal wechatAmount = BigDecimal.ZERO;
        BigDecimal alipayAmount = BigDecimal.ZERO;
        BigDecimal balanceAmount = BigDecimal.ZERO;
        if (rows != null) {
            for (Map<String, Object> row : rows) {
                String channel = row.get("payChannel") == null ? "" : row.get("payChannel").toString();
                BigDecimal shareAmount = getSummaryDecimal(row, "shareAmount");
                if ("WECHAT".equalsIgnoreCase(channel) || "WX".equalsIgnoreCase(channel)) {
                    wechatAmount = wechatAmount.add(shareAmount);
                } else if ("ALIPAY".equalsIgnoreCase(channel) || "ALI".equalsIgnoreCase(channel)) {
                    alipayAmount = alipayAmount.add(shareAmount);
                } else if ("BALANCE".equalsIgnoreCase(channel) || "WHITELIST".equalsIgnoreCase(channel)) {
                    balanceAmount = balanceAmount.add(shareAmount);
                } else {
                    wechatAmount = wechatAmount.add(shareAmount);
                }
            }
        }
        return buildPayTypeCircleData(wechatAmount, alipayAmount, balanceAmount);
@@ -2528,6 +2579,7 @@
        PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(), dto.getPageSize());

        List<ChargingOrderListVO> list = new ArrayList<>();
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();
        List<Map<String, Object>> maps = this.baseMapper.chargingList1(pageInfo, dto, startTime1, startTime2, endTime1, endTime2);
        for (Map<String, Object> map : maps) {
            if(null == map){
@@ -2541,34 +2593,36 @@
            }
            chargingOrderListVO.setUid(map.get("id").toString());
            chargingOrderListVO.setCode(map.get("code").toString());
            chargingOrderListVO.setId(Long.valueOf(map.get("id").toString()));
            chargingOrderListVO.setSiteId(Integer.valueOf(map.get("siteId").toString()));
            chargingOrderListVO.setOrderSource(Integer.valueOf(map.get("orderSource").toString()));
            chargingOrderListVO.setSiteName(map.get("siteName").toString());
            chargingOrderListVO.setOrderType(map.get("orderType").toString());
            chargingOrderListVO.setTerminalName(map.get("terminalName").toString());
            chargingOrderListVO.setElectricity(null == map.get("electricity") ? BigDecimal.ZERO : new BigDecimal(map.get("electricity").toString()));
            chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());
            Object periodElectricPrice = map.get("periodElectricPrice");
            Object periodServicePrice = map.get("periodServicePrice");
            if(null != periodServicePrice){
                Integer orderSource = Integer.valueOf(map.get("orderSource").toString());
            BigDecimal periodElectricPrice = getSummaryDecimal(map, "periodElectricPrice");
            BigDecimal periodServicePrice = getSummaryDecimal(map, "periodServicePrice");
            if(periodServicePrice.compareTo(BigDecimal.ZERO) != 0){
                Integer orderSource = chargingOrderListVO.getOrderSource();
                if(2 == orderSource){
                    BigDecimal bigDecimal = new BigDecimal(periodServicePrice.toString()).multiply(new BigDecimal(0.8)).setScale(2, RoundingMode.HALF_EVEN);
                    chargingOrderListVO.setPaymentAmount(new BigDecimal(periodElectricPrice.toString()).add(bigDecimal));
                    BigDecimal sharingAmount = new BigDecimal(periodServicePrice.toString()).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_EVEN);
                    BigDecimal bigDecimal = periodServicePrice.multiply(new BigDecimal("0.8")).setScale(2, RoundingMode.HALF_EVEN);
                    chargingOrderListVO.setServiceCharge(bigDecimal);
                    chargingOrderListVO.setPaymentAmount(periodElectricPrice.add(bigDecimal).setScale(2, RoundingMode.HALF_EVEN));
                    BigDecimal sharingAmount = periodServicePrice.multiply(new BigDecimal("0.2")).setScale(2, RoundingMode.HALF_EVEN);
                    chargingOrderListVO.setSharingAmount(sharingAmount);
                }else{
                    chargingOrderListVO.setPaymentAmount(new BigDecimal(periodElectricPrice.toString()).add(new BigDecimal(periodServicePrice.toString())).setScale(2, RoundingMode.HALF_EVEN));
                    chargingOrderListVO.setServiceCharge(periodServicePrice);
                    chargingOrderListVO.setPaymentAmount(periodElectricPrice.add(periodServicePrice).setScale(2, RoundingMode.HALF_EVEN));
                    chargingOrderListVO.setSharingAmount(BigDecimal.ZERO);
                }
            }else{
                chargingOrderListVO.setServiceCharge(BigDecimal.ZERO);
                chargingOrderListVO.setPaymentAmount(BigDecimal.ZERO);
                chargingOrderListVO.setSharingAmount(BigDecimal.ZERO);
            }
            chargingOrderListVO.setElectrovalence(null == map.get("electrovalence") ? BigDecimal.ZERO : new BigDecimal(map.get("electrovalence").toString()));
            chargingOrderListVO.setServiceCharge(null == map.get("serviceCharge") ? BigDecimal.ZERO : new BigDecimal(map.get("serviceCharge").toString()));
            BigDecimal bigDecimal = new BigDecimal("0.006");
            if (!"0".equals(map.get("rechargePaymentType").toString())) {
                chargingOrderListVO.setCommissionAmount(new BigDecimal(map.get("rechargeAmount").toString()).multiply(bigDecimal));
            }
            fillChargingPeriodIncome(chargingOrderListVO, siteServiceShareRatioMap);
            if(null != map.get("tripartitePlatformName")){
                chargingOrderListVO.setTripartitePlatformName(map.get("tripartitePlatformName").toString());
            }
@@ -2665,21 +2719,41 @@
        Map<String, Object> map = this.baseMapper.chargingListSum1(dto, startTime1, startTime2, endTime1, endTime2);
        System.err.println("充电时段统计-查询参数：" + JSON.toJSONString(dto));
        System.err.println("充电时段统计-汇总数据：" + JSON.toJSONString(map));
        if (map == null) {
            map = new HashMap<>();
        }
        //订单数量
        int orderCount = Integer.parseInt(map.get("orderCount").toString());
        int orderCount = Integer.parseInt(String.valueOf(map.getOrDefault("orderCount", "0")));
        // 计算充电总度数
        BigDecimal electronic = new BigDecimal(map.get("electronic").toString());
        BigDecimal electronic = new BigDecimal(String.valueOf(map.getOrDefault("electronic", "0")));
        // 支付金额
        BigDecimal paymentAmount = new BigDecimal(map.get("paymentAmount").toString());
        BigDecimal paymentAmount = new BigDecimal(String.valueOf(map.getOrDefault("paymentAmount", "0")));
        // 电费
        BigDecimal electrovalence = new BigDecimal(map.get("electrovalence").toString());
        BigDecimal electrovalence = new BigDecimal(String.valueOf(map.getOrDefault("electrovalence", "0")));
        // 服务费
        BigDecimal serviceCharge = new BigDecimal(map.get("serviceCharge").toString());
        chargingOrderTimeVO.setOrderCount(orderCount);
        BigDecimal serviceCharge = new BigDecimal(String.valueOf(map.getOrDefault("serviceCharge", "0")));
        chargingOrderTimeVO.setOrderCount(orderCount);
        chargingOrderTimeVO.setChargingCapacity(electronic.setScale(2, BigDecimal.ROUND_HALF_EVEN));
        chargingOrderTimeVO.setPaymentAmount(paymentAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
        chargingOrderTimeVO.setElectrovalence(electrovalence.setScale(2, BigDecimal.ROUND_HALF_EVEN));
        chargingOrderTimeVO.setServiceCharge(serviceCharge.setScale(2, BigDecimal.ROUND_HALF_EVEN));
        BigDecimal platformIncome = BigDecimal.ZERO;
        BigDecimal partnerIncome = BigDecimal.ZERO;
        for (Map<String, Object> sumMap : list1) {
            if (sumMap == null) {
                continue;
            }
            ChargingOrderListVO item = new ChargingOrderListVO();
            item.setSiteId(getSummaryLong(sumMap, "siteId").intValue());
            item.setOrderSource(getSummaryLong(sumMap, "orderSource").intValue());
            item.setPaymentAmount(getSummaryDecimal(sumMap, "paymentAmount"));
            item.setServiceCharge(getSummaryDecimal(sumMap, "serviceCharge"));
            fillChargingPeriodIncome(item, siteServiceShareRatioMap);
            platformIncome = platformIncome.add(nullToZero(item.getPlatformIncome()));
            partnerIncome = partnerIncome.add(nullToZero(item.getPartnerIncome()));
        }
        chargingOrderTimeVO.setPlatformIncome(platformIncome.setScale(2, RoundingMode.HALF_UP));
        chargingOrderTimeVO.setPartnerIncome(partnerIncome.setScale(2, RoundingMode.HALF_UP));
        // 计算尖峰平谷充电到账占比
        BigDecimal add = jianElectronic.add(fengElectronic).add(pingElectronic).add(guElectronic);
        // 计算尖峰平谷服务费占比
@@ -2809,7 +2883,60 @@
        dto.setSiteIds(siteIds);
        List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(dto, startTime1, startTime2, endTime1, endTime2);
        fillChargingPeriodExportBalanceIncome(list1);
        fillChargingPeriodIncome(list1);
        return list1;
    }

    private void fillChargingPeriodIncome(List<ChargingOrderListVO> list) {
        if (list == null || list.isEmpty()) {
            return;
        }
        Map<Integer, BigDecimal> siteServiceShareRatioMap = loadSiteServiceShareRatioMap();
        for (ChargingOrderListVO item : list) {
            fillChargingPeriodIncome(item, siteServiceShareRatioMap);
        }
    }

    private void fillChargingPeriodIncome(ChargingOrderListVO item, Map<Integer, BigDecimal> siteServiceShareRatioMap) {
        if (item == null) {
            return;
        }
        BigDecimal paymentAmount = nullToZero(item.getPaymentAmount());
        BigDecimal partnerIncome = BigDecimal.ZERO;
        if (!Integer.valueOf(2).equals(item.getOrderSource())) {
            BigDecimal serviceShareRatio = siteServiceShareRatioMap.get(item.getSiteId());
            if (serviceShareRatio != null && serviceShareRatio.compareTo(BigDecimal.ZERO) > 0) {
                partnerIncome = nullToZero(item.getServiceCharge())
                        .multiply(serviceShareRatio)
                        .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
            }
        }
        item.setPartnerIncome(partnerIncome);
        item.setPlatformIncome(paymentAmount.subtract(partnerIncome).max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_UP));
    }

    private Map<Integer, BigDecimal> loadSiteServiceShareRatioMap() {
        Map<Integer, BigDecimal> ratioMap = new HashMap<>();
        R<List<Site>> siteResult = siteClient.getSiteAll();
        R<List<Partner>> partnerResult = siteClient.getAllPartner();
        List<Site> sites = siteResult == null ? Collections.emptyList() : siteResult.getData();
        List<Partner> partners = partnerResult == null ? Collections.emptyList() : partnerResult.getData();
        if (sites == null || sites.isEmpty() || partners == null || partners.isEmpty()) {
            return ratioMap;
        }
        Map<Integer, Partner> partnerMap = partners.stream()
                .filter(partner -> partner != null && partner.getId() != null)
                .collect(Collectors.toMap(Partner::getId, partner -> partner, (left, right) -> left));
        for (Site site : sites) {
            if (site == null || site.getId() == null || site.getPartnerId() == null) {
                continue;
            }
            Partner partner = partnerMap.get(site.getPartnerId());
            if (partner != null && partner.getServiceShareRatio() != null) {
                ratioMap.put(site.getId(), partner.getServiceShareRatio());
            }
        }
        return ratioMap;
    }

    /**
@@ -2840,6 +2967,31 @@
        }
    }

    private void fillChargingOrderShareIncome(List<ChargingOrderVO> list) {
        if (list == null || list.isEmpty()) {
            return;
        }
        List<Long> orderIds = list.stream().map(ChargingOrderVO::getId).filter(Objects::nonNull).collect(Collectors.toList());
        if (orderIds.isEmpty()) {
            return;
        }
        Map<Long, Map<String, Object>> incomeMap = new HashMap<>();
        List<Map<String, Object>> rows = this.baseMapper.chargingOrderShareIncomeByOrderIds(orderIds);
        if (rows != null) {
            for (Map<String, Object> row : rows) {
                Long orderId = getSummaryLong(row, "orderId");
                if (orderId != null) {
                    incomeMap.put(orderId, row);
                }
            }
        }
        for (ChargingOrderVO item : list) {
            Map<String, Object> row = incomeMap.get(item.getId());
            item.setPlatformIncome(getSummaryDecimal(row, "platformIncome"));
            item.setPartnerIncome(getSummaryDecimal(row, "partnerIncome"));
        }
    }

    
    @Override
    public ChargingOrderListInfoVO chargingInfo(String uid) {

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml

@@ -43,6 +43,9 @@
        <if test="req.uid != null ">
            and t1.id = #{req.uid}
        </if>
        <if test="req.payType != null and req.payType != 0">
            and t1.payType = #{req.payType}
        </if>
        <if test="null != req.siteIds and req.siteIds.size()>0" >
            and t1.site_id in
            <foreach collection="req.siteIds" close=")" open="(" item="item" separator=",">
@@ -93,6 +96,9 @@
        <if test="req.uid != null ">
            and t1.id = #{req.uid}
        </if>
        <if test="req.payType != null and req.payType != 0">
            and t1.payType = #{req.payType}
        </if>
        <if test="null != req.siteIds and req.siteIds.size()>0" >
            and t1.site_id in
            <foreach collection="req.siteIds" close=")" open="(" item="item" separator=",">

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -387,6 +387,36 @@

    </select>
    <select id="charge" resultType="com.ruoyi.order.dto.SixChargingDto">
        <choose>
        <when test="partnerView != null and partnerView">
        SELECT
        DATE_FORMAT(a.create_time, '%m') AS MONTH,
        ROUND(SUM(IFNULL(s.electricity_share_amount, 0)), 2) AS electrovalence,
        ROUND(SUM(IFNULL(s.service_share_amount, 0)), 2) AS service_charge
        FROM t_charging_order a
        LEFT JOIN (
            SELECT charging_order_id,
            SUM(IFNULL(electricity_share_amount, 0)) AS electricity_share_amount,
            SUM(IFNULL(service_share_amount, 0)) AS service_share_amount
            FROM t_charging_order_share_record
            WHERE del_flag = 0 AND charging_order_id IS NOT NULL
            GROUP BY charging_order_id
        ) s ON a.id = s.charging_order_id
        <where>
            a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5
            <if test="sixBefore != null">
                AND a.create_time &gt;= #{sixBefore}
            </if>
            <if test="siteIds != null and siteIds.size() > 0">
                AND a.site_id IN
                <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                    #{siteId}
                </foreach>
            </if>
        </where>
        GROUP BY DATE_FORMAT(a.create_time, '%m')
        </when>
        <otherwise>
        SELECT
        DATE_FORMAT(a.create_time, '%m') AS MONTH,
        SUM(IFNULL(b.period_electric_price, 0)) AS electrovalence,
@@ -414,10 +444,39 @@
        </where>
        GROUP BY
        DATE_FORMAT(a.create_time, '%m')
        </otherwise>
        </choose>


    </select>
    <select id="circle" resultType="com.ruoyi.order.dto.SixCircleDto">
        <choose>
        <when test="partnerView != null and partnerView">
        SELECT
        a.site_id as siteId,
        ROUND(SUM(IFNULL(s.share_amount, 0)), 2) AS paymentAmount
        FROM t_charging_order a
        LEFT JOIN (
            SELECT charging_order_id, SUM(IFNULL(share_amount, 0)) AS share_amount
            FROM t_charging_order_share_record
            WHERE del_flag = 0 AND charging_order_id IS NOT NULL
            GROUP BY charging_order_id
        ) s ON a.id = s.charging_order_id
        <where>
            a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5
            <if test="siteIds != null and siteIds.size() > 0">
                AND a.site_id IN
                <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                    #{siteId}
                </foreach>
            </if>
            <if test="sixBefore != null">
                AND a.create_time &gt;= #{sixBefore}
            </if>
        </where>
        GROUP BY a.site_id
        </when>
        <otherwise>
        SELECT
        a.site_id as siteId,
        ROUND(SUM(CASE
@@ -441,26 +500,44 @@
            </if>
        </where>
        GROUP BY a.site_id
        </otherwise>
        </choose>


    </select>
    <select id="countAll" resultType="java.util.Map">
        SELECT
        <choose>
        <when test="partnerView != null and partnerView">
        ROUND(SUM(IFNULL(s.electricity_share_amount, 0)), 2) AS electrovalence,
        ROUND(SUM(IFNULL(s.service_share_amount, 0)), 2) AS service_charge,
        ROUND(SUM(IFNULL(s.share_amount, 0)), 2) AS commission_amount,
        0 AS sharing_amount
        </when>
        <otherwise>
        ROUND(SUM(IFNULL(b.period_electric_price, 0)), 2) AS electrovalence,
        ROUND(SUM(CASE
        WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.8
        ELSE IFNULL(b.period_service_price, 0)
        END), 2) AS service_charge,
        ROUND(SUM(CASE
        WHEN a.order_source = 2 THEN 0
        ELSE IFNULL(b.period_electric_price, 0) + IFNULL(b.period_service_price, 0)
        END) * 0.006, 2) AS commission_amount,
        ROUND(SUM(CASE
        WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.2
        ELSE 0
        END), 2) AS sharing_amount
        ROUND(SUM(CASE WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.8 ELSE IFNULL(b.period_service_price, 0) END), 2) AS service_charge,
        ROUND(SUM(IFNULL(s.share_amount, 0)), 2) AS commission_amount,
        ROUND(SUM(CASE WHEN a.order_source = 2 THEN IFNULL(b.period_service_price, 0) * 0.2 ELSE 0 END), 2) AS sharing_amount
        </otherwise>
        </choose>
        FROM t_charging_order a
        LEFT JOIN t_charging_order_accounting_strategy b ON a.id = b.charging_order_id
        LEFT JOIN (
            SELECT charging_order_id,
            SUM(IFNULL(period_electric_price, 0)) AS period_electric_price,
            SUM(IFNULL(period_service_price, 0)) AS period_service_price
            FROM t_charging_order_accounting_strategy
            GROUP BY charging_order_id
        ) b ON a.id = b.charging_order_id
        LEFT JOIN (
            SELECT charging_order_id,
            SUM(IFNULL(electricity_share_amount, 0)) AS electricity_share_amount,
            SUM(IFNULL(service_share_amount, 0)) AS service_share_amount,
            SUM(IFNULL(share_amount, 0)) AS share_amount
            FROM t_charging_order_share_record
            WHERE del_flag = 0 AND charging_order_id IS NOT NULL
            GROUP BY charging_order_id
        ) s ON a.id = s.charging_order_id
        WHERE a.del_flag = 0 AND a.recharge_payment_status = 2 AND a.status = 5
        <if test="siteIds != null and siteIds.size() > 0">
            AND a.site_id IN
@@ -1257,6 +1334,8 @@
    <select id="chargingListSum" resultType="map">
        select
        a.id,
        a.siteId,
        a.order_source as orderSource,
        sum(a.charging_capacity) as electronic,
        sum(a.period_electric_price) as electrovalence,
        sum(CASE WHEN a.order_source = 2 THEN a.period_service_price * 0.8 ELSE a.period_service_price END) as serviceCharge,
@@ -1274,7 +1353,7 @@
        sum(CASE WHEN a.type = 3 THEN a.charging_capacity ELSE 0 END) as ping,
        sum(CASE WHEN a.type = 4 THEN a.charging_capacity ELSE 0 END) as gu
        from (
            select co.id,coas.type, coas.charging_capacity, coas.period_electric_price, coas.period_service_price, co.order_source
            select co.id, co.site_id as siteId, coas.type, coas.charging_capacity, coas.period_electric_price, coas.period_service_price, co.order_source
            from t_charging_order_accounting_strategy coas
            left join t_charging_order co on (coas.charging_order_id = co.id)
            where co.del_flag = 0 and co.recharge_payment_status = 2
@@ -1321,7 +1400,7 @@
                and co.end_time between #{endTime1} and #{endTime2}
            </if>
            and co.start_time IS NOT NULL and co.end_time is not null
        ) as a group by a.id
        ) as a group by a.id, a.siteId, a.order_source
    </select>


@@ -2231,6 +2310,59 @@
        ) as aa
    </select>

    <select id="chargingOrderShareIncomeByOrderIds" resultType="map">
        select
        charging_order_id as orderId,
        sum(IFNULL(channel_pay_amount, 0) - IFNULL(share_amount, 0)) as platformIncome,
        sum(IFNULL(share_amount, 0)) as partnerIncome
        from `charging_pile_order`.t_charging_order_share_record
        where del_flag = 0 and charging_order_id is not null
        <if test="orderIds != null and orderIds.size()>0">
            and charging_order_id in
            <foreach collection="orderIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
        </if>
        group by charging_order_id
    </select>

    <select id="chargingOrderShareIncomeByPayChannel" resultType="map">
        select
        s.pay_channel as payChannel,
        sum(IFNULL(s.share_amount, 0)) as shareAmount
        from t_charging_order_share_record s
        inner join t_charging_order o on s.charging_order_id = o.id
        where s.del_flag = 0
        and s.charging_order_id is not null
        and o.del_flag = 0
        and o.recharge_payment_status = 2
        and o.status = 5
        <if test="sixBefore != null">
            and o.create_time &gt;= #{sixBefore}
        </if>
        <if test="siteIds != null and siteIds.size() > 0">
            and o.site_id in
            <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
                #{siteId}
            </foreach>
        </if>
        group by s.pay_channel
    </select>

    <select id="chargingOrderShareIncomeSummaryByOrderIds" resultType="map">
        select
        sum(IFNULL(channel_pay_amount, 0) - IFNULL(share_amount, 0)) as platformIncomeTotal,
        sum(IFNULL(share_amount, 0)) as partnerIncomeTotal
        from `charging_pile_order`.t_charging_order_share_record
        where del_flag = 0 and charging_order_id is not null
        <if test="orderIds != null and orderIds.size()>0">
            and charging_order_id in
            <foreach collection="orderIds" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
        </if>
    </select>

    <select id="chargingOrderSummaryOrderIds" resultType="java.lang.Long">
        select b.id
        from `charging_pile_order`.t_charging_order b