bug修改

无关风月

2024-11-03 531050d659f23b7dcb00d269bdf7bef86ab66c09

bug修改

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

@@ -34,7 +34,12 @@
    @ApiModelProperty(value = "主键")
    @TableId(value = "id")
    private Long id;

    @ApiModelProperty(value = "序号")
    @TableField(exist = false)
    private Integer xuhao;
    @ApiModelProperty(value = "月份")
    @TableField(exist = false)
    private Integer month;
    @ApiModelProperty(value = "站点id")
    @TableField("site_id")
    private Integer siteId;

 ruoyi-service/ruoyi-chargingPile/src/main/resources/template/结算汇总.xlsx

Binary files differ

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

@@ -1274,7 +1274,7 @@
            electronicMoney = electronicMoney.add(chargingOrderVO.getElectrovalence());
            serviceMoney = serviceMoney.add(chargingOrderVO.getServiceCharge());

            income = income.add(chargingOrderVO.getOrderAmount());
            income = income.add(chargingOrderVO.getPaymentAmount());



@@ -2582,7 +2582,7 @@
                couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount());
            }
            if (tChargingOrder.getPaymentAmount()!=null){
                paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
                paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
            }

        }
@@ -2733,7 +2733,9 @@
        BigDecimal beforeCost= new BigDecimal("0");
        // 上月利润合计
        BigDecimal beforeIncome= new BigDecimal("0");
        int i = 0;
        for (TSettlementConfirm tSettlementConfirm : list1) {
            tSettlementConfirm.setXuhao(i);
            tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
            List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(tSettlementConfirm.getSiteId())).getData();
            if (!data1.isEmpty()){
@@ -2836,6 +2838,8 @@


            for (TSettlementConfirm settlementConfirm : list2) {
                int value = parse.getMonth().getValue();
                settlementConfirm.setMonth(value);
                settlementConfirm.setIncome(settlementConfirm.getElectrovalence().add(settlementConfirm.getServiceCharge()));
                tSettlementConfirm.setMetering(tSettlementConfirm.getSupplyElectronic());
                if (tSettlementConfirm.getSiteId().equals(settlementConfirm.getSiteId())){
@@ -2861,6 +2865,7 @@


            }
            i++;
        }
        TSettlementConfirm tSettlementConfirm = new TSettlementConfirm();
        tSettlementConfirm.setMeteringElectronic(meteringElectronic);