明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2025-02-21 ae76f22f897cfd438b30829326b6ad36a80eaac0 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java


@@ -920,7 +920,8 @@


               chargingOrderRefundService.save(chargingOrderRefund);


               //手续费


               Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");


               BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));


               Object refund_fee1 = amount1.get("refund_fee");


               BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));


               chargingOrderRefund.setRefundFee(refund_fee);


               chargingOrderRefundService.updateById(chargingOrderRefund);


            }


@@ -1383,7 +1384,9 @@




      for (ChargingOrderVO chargingOrderVO : list1) {


         paymentMoney= paymentMoney.add(chargingOrderVO.getPaymentAmount()!=null?chargingOrderVO.getPaymentAmount():new BigDecimal("0"));


         commissionMoney = commissionMoney.add(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));


         if (chargingOrderVO.getRechargeAmount()!=null){


            commissionMoney = commissionMoney.add(chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));


         }


         if (chargingOrderVO.getChargingCapacity()!=null){


            total = total.add(chargingOrderVO.getElectricity()!=null?chargingOrderVO.getElectricity():new BigDecimal("0"));


         }


@@ -1404,7 +1407,6 @@


      }


      tCharingOrderVO.setTotal(total);


      tCharingOrderVO.setTime(time);


      // todo 临时只累加


//      tCharingOrderVO.setIncome(paymentMoney.subtract(commissionMoney));


      tCharingOrderVO.setIncome(paymentMoney);


      tCharingOrderVO.setElectronicMoney(electronicMoney);


@@ -2443,7 +2445,8 @@


                  chargingOrderRefundService.save(chargingOrderRefund);


                  //手续费


                  Map<String, Object> amount1 = (Map<String, Object>) result.getData().get("amount");


                  BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));


                  Object refund_fee1 = amount1.get("refund_fee");


                  BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));


                  chargingOrderRefund.setRefundFee(refund_fee);


                  chargingOrderRefundService.updateById(chargingOrderRefund);


               }


@@ -2609,7 +2612,8 @@


                  chargingOrderRefundService.save(chargingOrderRefund);


                  //手续费


                  Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");


                  BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));


                  Object refund_fee1 = amount1.get("refund_fee");


                  BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));


                  chargingOrderRefund.setRefundFee(refund_fee);


                  chargingOrderRefundService.updateById(chargingOrderRefund);


               }


@@ -2676,7 +2680,8 @@


                  shoppingOrderRefundService.save(chargingOrderRefund);


                  //手续费


                  Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");


                  BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));


                  Object refund_fee1 = amount1.get("refund_fee");


                  BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));


                  chargingOrderRefund.setRefundFee(refund_fee);


                  shoppingOrderRefundService.updateById(chargingOrderRefund);


               }


@@ -2740,7 +2745,8 @@


               vipOrderRefundService.save(chargingOrderRefund);


               //手续费


               Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");


               BigDecimal refund_fee = new BigDecimal(amount1.get("refund_fee").toString()).divide(new BigDecimal(100));


               Object refund_fee1 = amount1.get("refund_fee");


               BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));


               chargingOrderRefund.setRefundFee(refund_fee);


               vipOrderRefundService.updateById(chargingOrderRefund);


            }