代码提交

无关风月

2024-09-11 a71bf51568cbee157df2cc3bd0348002f2400410

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

@@ -1384,6 +1384,22 @@
      TChargingOrder chargingOrder= this.getById(uid);

      ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
      chargingOrderListInfoVO.setElectrovalence(chargingOrder.getElectrovalence());
      chargingOrderListInfoVO.setServiceCharge(chargingOrder.getServiceCharge());
      if (chargingOrder.getElectrovalence()!=null && chargingOrder.getServiceCharge()!=null){
         chargingOrderListInfoVO.setTotal(chargingOrder.getElectrovalence().add(chargingOrder.getServiceCharge()));
      }else{
         chargingOrderListInfoVO.setTotal(new BigDecimal("0"));
      }
      if (chargingOrderListInfoVO.getTotal().compareTo(new BigDecimal("0"))>0){
         if (chargingOrder.getCouponDiscountAmount()!=null&& chargingOrder.getVipDiscountAmount()!=null&& chargingOrder.getSharingAmount()!=null&& chargingOrder.getCommissionAmount()!=null){
            chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal().subtract(chargingOrder.getCouponDiscountAmount()).subtract(chargingOrder.getVipDiscountAmount()).subtract(chargingOrder.getSharingAmount()).subtract(chargingOrder.getCommissionAmount()));
         }else{
            chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal());
         }
      }else{
         chargingOrderListInfoVO.setRealTotal(new BigDecimal("0"));
      }
      chargingOrderListInfoVO.setCode(chargingOrder.getCode());
      List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData();
      if (!data.isEmpty()){
@@ -1860,7 +1876,7 @@
      tSettlementConfirm.setMetering(dto.getData().getMetering());
      tSettlementConfirm.setClean(dto.getData().getClean());
      tSettlementConfirm.setMaintain(dto.getData().getMaintain());
      tSettlementConfirm.setCost(dto.getData().getVenue().add(dto.getData().getClean()).add(dto.getData().getMaintain()));
      tSettlementConfirm.setCost(dto.getData().getMaintain().subtract(dto.getData().getVenue().add(dto.getData().getClean()).add(dto.getData().getMaintain())));
      tSettlementConfirm.setProfitMoney(new BigDecimal("0"));
      tSettlementConfirm.setNewMoney(new BigDecimal("0"));
      tSettlementConfirm.setNewSettlement(new BigDecimal("0"));