Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2025-02-21 ae76f22f897cfd438b30829326b6ad36a80eaac0

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

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

@@ -88,13 +88,13 @@
    private TSettlementConfirmService tSettlementConfirmService;
    @Resource
    private VipClient vipClient;
    @Autowired
    @Resource
    private SiteClient siteClient;
    @Autowired
    @Resource
    private AppUserClient appUserClient;
    @Autowired
    @Resource
    private ChargingGunClient chargingGunClient;
    @Autowired
    @Resource
    private AppUserCarClient appUserCarClient;
    @Resource
    private AccountingStrategyOrderService accountingStrategyOrderService;

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

@@ -239,7 +239,8 @@
                    shoppingOrderRefundService.save(tShoppingOrderRefund);
                    //手续费
                    Map<String, Object> amount1 = (Map<String, Object>) stringR.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));
                    tShoppingOrderRefund.setRefundFee(refund_fee);
                    shoppingOrderRefundService.updateById(tShoppingOrderRefund);
                }

 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);
                }
@@ -2444,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);
                    }
@@ -2610,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);
                    }
@@ -2677,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);
                    }
@@ -2741,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);
                }

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

@@ -457,7 +457,8 @@
                shoppingOrderRefundService.save(shoppingOrderRefund);
                //手续费
                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));
                shoppingOrderRefund.setRefundFee(refund_fee);
                shoppingOrderRefundService.updateById(shoppingOrderRefund);
            }