增加退款前的数据校验，防止重复退款

puzhibing

2026-07-17 df22fbc272a1a8debe24ae037470a7c3fcb06571

增加退款前的数据校验，防止重复退款

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

@@ -1328,10 +1328,10 @@
                    BigDecimal thirdRefundAmount = channelRefundAmount.min(getRefundableThirdPayAmount(chargingOrder)).setScale(2, RoundingMode.HALF_UP);
                    BigDecimal balanceRefundAmount = channelRefundAmount.subtract(thirdRefundAmount).min(money(chargingOrder.getBalancePayAmount())).setScale(2, RoundingMode.HALF_UP);
                    //构建退款明细
                    String refundCode = "CDF" + chargingOrder.getCode().substring(2);
                    TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                    chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + Double.valueOf(Math.random() * 1000).intValue());
                    chargingOrderRefund.setRefundCode(refundCode);
                    chargingOrderRefund.setRefundAmount(recordedRefundAmount);
                    chargingOrderRefund.setBalanceRefundAmount(balanceRefundAmount);
                    chargingOrderRefund.setThirdRefundAmount(thirdRefundAmount);
@@ -1367,6 +1367,11 @@
                            .eq(TChargingOrder::getId, chargingOrder.getId())
                            .eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId()));
                    if (thirdRefundAmount.compareTo(BigDecimal.ZERO) > 0 && 1 == rechargePaymentType) {
                        Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                        Map<String, Object> amount1 = null;
                        if(null != objectMap && null != objectMap.get("refund_id")){
                            amount1 = (Map<String, Object>) objectMap.get("amount");
                        }else{
                        WxPaymentRefundModel model = new WxPaymentRefundModel();
                        model.setOut_trade_no(chargingOrder.getCode());
                        model.setOut_refund_no(chargingOrderRefund.getRefundCode());
@@ -1379,9 +1384,12 @@
                        model.setAmount(amount);
                        R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
                        if (200 == orderR.getCode()) {
                                amount1 = (Map<String, Object>) orderR.getData().get("amount");
                            }
                        }
                        if (null != amount1) {
                            chargingOrderRefundService.save(chargingOrderRefund);
                            //手续费
                            Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
                            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);
@@ -1486,10 +1494,10 @@
            Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
            Integer payMethod = chargingOrder.getPayMethod();
            //构建退款明细
            String refundCode = "CDF" + chargingOrder.getCode().substring(2);
            TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
            chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + Double.valueOf(Math.random() * 1000).intValue());
            chargingOrderRefund.setRefundCode(refundCode);
            chargingOrderRefund.setRefundAmount(money);
            BigDecimal thirdRefundAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
            BigDecimal balanceRefundAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
@@ -1523,6 +1531,11 @@
                return;
            }
            if (1 == rechargePaymentType) {
                Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                Map<String, Object> amount1 = null;
                if(null != objectMap && null != objectMap.get("refund_id")){
                    amount1 = (Map<String, Object>) objectMap.get("amount");
                }else{
                WxPaymentRefundModel model = new WxPaymentRefundModel();
                model.setOut_trade_no(chargingOrder.getCode());
                model.setOut_refund_no(chargingOrderRefund.getRefundCode());
@@ -1535,9 +1548,12 @@
                model.setAmount(amount);
                R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
                if (200 == orderR.getCode()) {
                        amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    }
                }
                if (null != amount1) {
                    chargingOrderRefundService.save(chargingOrderRefund);
                    //手续费
                    Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    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);
@@ -3514,10 +3530,10 @@
                    Integer rechargePaymentType = chargingOrder.getRechargePaymentType();
                    if (channelRefundAmount.compareTo(BigDecimal.ZERO) > 0) {
                        //构建退款明细
                        String refundCode = "CDF" + chargingOrder.getCode().substring(2);
                        TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                        chargingOrderRefund.setChargingOrderId(chargingOrder.getId());
                        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                        chargingOrderRefund.setRefundCode("CDF" + sdf1.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                        chargingOrderRefund.setRefundCode(refundCode);
                        chargingOrderRefund.setRefundAmount(refundAmount);
                        chargingOrderRefund.setBalanceRefundAmount(balanceRefundAmount);
                        chargingOrderRefund.setThirdRefundAmount(thirdRefundAmount);
@@ -3546,6 +3562,11 @@
                                    .eq(TChargingOrder::getId, chargingOrder.getId())
                                    .eq(TChargingOrder::getAppUserId, chargingOrder.getAppUserId()));
                        } else if (1 == rechargePaymentType) {
                            Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                            Map<String, Object> amount1 = null;
                            if(null != objectMap && null != objectMap.get("refund_id")){
                                amount1 = (Map<String, Object>) objectMap.get("amount");
                            }else{
                            WxPaymentRefundModel model = new WxPaymentRefundModel();
                            model.setOut_trade_no(chargingOrder.getCode());
                            model.setOut_refund_no(chargingOrderRefund.getRefundCode());
@@ -3558,8 +3579,12 @@
                            model.setAmount(amount);
                            R<Map<String, Object>> result = wxPaymentClient.refundOrderR(model);
                            if (200 == result.getCode()) {
                                    amount1 = (Map<String, Object>) result.getData().get("amount");
                                }
                            }

                            if (null != amount1) {
                                //手续费
                                Map<String, Object> amount1 = (Map<String, Object>) result.getData().get("amount");
                                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);
@@ -3788,7 +3813,7 @@
            if ((tChargingOrder.getRechargeAmount().subtract(tChargingOrder.getRefundAmount()).compareTo(payOrderQueryDto.getRefundAmount())) == 0) {
                tChargingOrder.setStatus(5);
            }

            String refundCode = "CDF" + tChargingOrder.getCode().substring(2);
            TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
            chargingOrderRefund.setChargingOrderId(tChargingOrder.getId());
            chargingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -3796,8 +3821,7 @@
            chargingOrderRefund.setPayType(tChargingOrder.getRechargePaymentType());
            chargingOrderRefund.setRefundTime(LocalDateTime.now());
            chargingOrderRefund.setCode(tChargingOrder.getCode());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            chargingOrderRefund.setRefundCode("CDF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
            chargingOrderRefund.setRefundCode(refundCode);
            chargingOrderRefund.setRefundTitle("后台退款");
            chargingOrderRefund.setRefundContent("后台退款");
            chargingOrderRefund.setRefundReason("后台退款");
@@ -3824,6 +3848,11 @@
                chargingOrderRefund.setRefundSerialNumber("BALANCE");
                finishManualChargingRefund(tChargingOrder, chargingOrderRefund, manualRefundAmount, balanceRefundAmount, thirdRefundAmount);
            } else if (1 == tChargingOrder.getRechargePaymentType()) {
                Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                Map<String, Object> amount1 = null;
                if(null != objectMap && null != objectMap.get("refund_id")){
                    amount1 = (Map<String, Object>) objectMap.get("amount");
                }else{
                WxPaymentRefundModel model = new WxPaymentRefundModel();
                model.setOut_trade_no(tChargingOrder.getCode());
                model.setOut_refund_no(chargingOrderRefund.getRefundCode());
@@ -3837,9 +3866,12 @@
                model.setAmount(amount);
                R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
                if (200 == orderR.getCode()) {
                        amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    }
                }
                if (null != amount1) {
                    finishManualChargingRefund(tChargingOrder, chargingOrderRefund, manualRefundAmount, balanceRefundAmount, thirdRefundAmount);
                    //手续费
                    Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    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);
@@ -3893,7 +3925,7 @@
            if ((shoppingOrder.getPaymentAmount().subtract(shoppingOrder.getRefundAmount()).compareTo(payOrderQueryDto.getRefundAmount())) == 0) {
                shoppingOrder.setStatus(5);
            }

            String refundCode = "GWF" + shoppingOrder.getCode().substring(2);
            TShoppingOrderRefund shoppingOrderRefund = new TShoppingOrderRefund();
            shoppingOrderRefund.setShoppingOrderId(shoppingOrder.getId());
            shoppingOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -3902,7 +3934,7 @@
            shoppingOrderRefund.setRefundTime(LocalDateTime.now());
            shoppingOrderRefund.setCode(shoppingOrder.getCode());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            shoppingOrderRefund.setRefundCode("GWF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
            shoppingOrderRefund.setRefundCode(refundCode);
            shoppingOrderRefund.setRefundTitle("后台退款");
            shoppingOrderRefund.setRefundContent("后台退款");
            shoppingOrderRefund.setRefundReason("后台退款");
@@ -3911,6 +3943,11 @@
            shoppingOrderRefund.setPayAmount(shoppingOrder.getPaymentAmount());

            if (1 == shoppingOrder.getPaymentType()) {
                Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                Map<String, Object> amount1 = null;
                if(null != objectMap && null != objectMap.get("refund_id")){
                    amount1 = (Map<String, Object>) objectMap.get("amount");
                }else{
                WxPaymentRefundModel model = new WxPaymentRefundModel();
                model.setOut_trade_no(shoppingOrder.getCode());
                model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
@@ -3924,12 +3961,15 @@
                model.setAmount(amount);
                R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
                if (200 == orderR.getCode()) {
                        amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    }
                }
                if (null != amount1) {
                    shoppingOrder.setRefundStatus(2);
                    shoppingOrder.setRefundAmount((shoppingOrder.getRefundAmount() == null ? BigDecimal.valueOf(0) : shoppingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                    shoppingOrderService.updateById(shoppingOrder);
                    shoppingOrderRefundService.save(shoppingOrderRefund);
                    //手续费
                    Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    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);
@@ -3973,6 +4013,7 @@
            if (vipOrder.getPaymentAmount().compareTo(payOrderQueryDto.getRefundAmount()) == -1) {
                return R.fail("退款金额需小于支付金额");
            }
            String refundCode = "HYF" + vipOrder.getCode().substring(2);
            TVipOrderRefund vipOrderRefund = new TVipOrderRefund();
            vipOrderRefund.setVipOrderId(vipOrder.getId());
            vipOrderRefund.setRefundAmount(payOrderQueryDto.getRefundAmount());
@@ -3982,8 +4023,7 @@
            vipOrderRefund.setPayType(vipOrder.getPaymentType());
            vipOrderRefund.setRefundTime(LocalDateTime.now());
            vipOrderRefund.setCode(vipOrder.getCode());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            vipOrderRefund.setRefundCode("HYF" + sdf.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
            vipOrderRefund.setRefundCode(refundCode);
            vipOrderRefund.setRefundTitle("后台退款");
            vipOrderRefund.setRefundContent("后台退款");
            vipOrderRefund.setRefundReason("后台退款");
@@ -3992,6 +4032,11 @@
            vipOrderRefund.setPayAmount(vipOrder.getPaymentAmount());

            if (1 == vipOrder.getPaymentType()) {
                Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                Map<String, Object> amount1 = null;
                if(null != objectMap && null != objectMap.get("refund_id")){
                    amount1 = (Map<String, Object>) objectMap.get("amount");
                }else{
                WxPaymentRefundModel model = new WxPaymentRefundModel();
                model.setOut_trade_no(vipOrder.getCode());
                model.setOut_refund_no(vipOrderRefund.getRefundCode());
@@ -4005,12 +4050,15 @@
                model.setAmount(amount);
                R<Map<String, Object>> orderR = wxPaymentClient.refundOrderR(model);
                if (200 == orderR.getCode()) {
                        amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    }
                }
                if (null != amount1) {
                    vipOrder.setRefundStatus(2);
                    vipOrder.setRefundAmount((vipOrder.getRefundAmount() == null ? BigDecimal.valueOf(0) : vipOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                    vipOrderService.updateById(vipOrder);
                    vipOrderRefundService.save(vipOrderRefund);
                    //手续费
                    Map<String, Object> amount1 = (Map<String, Object>) orderR.getData().get("amount");
                    Object refund_fee1 = amount1.get("refund_fee");
                    BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
                    vipOrderRefund.setRefundFee(refund_fee);
@@ -5356,6 +5404,11 @@
                    throw new ServiceException("退款查询失败");
                }
                log.info("退款查询结果:{}", JSON.toJSONString(data));
                Object status = data.get("status");
                if(null == status){
                    throw new ServiceException("无退款数据");
                }

                Map<String, Object> amount = (Map<String, Object>) data.get("amount");
                TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                chargingOrderRefund.setChargingOrderId(chargingOrder.getId());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -272,6 +272,9 @@
            List<TChargingOrder> upStatusChargingOrder = chargingOrderService.findUpStatusChargingOrder();
            log.info("定时任务执行，查询需要手动修改状态的订单数量：{}", upStatusChargingOrder.size());
            for (TChargingOrder order : upStatusChargingOrder) {
                if(!order.getCode().contains("CD")){
                    continue;
                }
                Integer status = null;
                if(2 == order.getStatus()){
                    status = -1;
@@ -295,6 +298,9 @@
            List<TChargingOrder> failedStartupOrder = chargingOrderService.findFailedStartupOrder();
            log.info("定时任务执行，查询到启动失败的订单数量：{}", failedStartupOrder.size());
            for (TChargingOrder order : failedStartupOrder) {
                if(!order.getCode().contains("CD")){
                    continue;
                }
                log.info("定时任务执行，查询到启动失败的订单：{}", order.getCode());
                //查询是否有充电信息
                List<UploadRealTimeMonitoringData> dataByOrderCode = uploadRealTimeMonitoringDataService.getDataByOrderCode(order.getCode());
@@ -352,6 +358,9 @@
            List<TChargingOrder> stoppedOrder = chargingOrderService.findStoppedOrder();
            log.info("定时任务执行，查询到停止中的订单数量：{}", stoppedOrder.size());
            for (TChargingOrder order : stoppedOrder) {
                if(!order.getCode().contains("CD")){
                    continue;
                }
                log.info("定时任务执行，查询到停止中的订单：{}", order.getCode());
                TransactionRecord one = transactionRecordService.findOne(order.getCode());
                if(null != one){
@@ -396,6 +405,9 @@
            List<TChargingOrder> chargingOrder = chargingOrderService.findChargingOrder();
            log.info("定时任务执行，查询到充电中的订单数量：{}", chargingOrder.size());
            for (TChargingOrder order : chargingOrder) {
                if(!order.getCode().contains("CD")){
                    continue;
                }
                log.info("定时任务执行，查询到充电中的订单：{}", order.getCode());
                TransactionRecord one = transactionRecordService.findOne(order.getCode());
                if(null != one && StringUtils.isNotEmpty(one.getResult())){
@@ -444,6 +456,9 @@
            List<TChargingOrder> endChargingOrder = chargingOrderService.findEndChargingOrder();
            log.info("定时任务执行，查询到已结束未退款的订单数量：{}", endChargingOrder.size());
            for (TChargingOrder order : endChargingOrder) {
                if(!order.getCode().contains("CD")){
                    continue;
                }
                Integer status = null;
                if(-1 == order.getStatus()){
                    status = 2;
@@ -879,10 +894,10 @@
                                    .eq(TChargingOrder::getAppUserId, order.getAppUserId()));

                            //构建退款明细
                            String refundCode = "CDF" + order.getCode().substring(2);
                            TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                            chargingOrderRefund.setChargingOrderId(order.getId());
                            SimpleDateFormat sdfaa = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                            chargingOrderRefund.setRefundCode("CDF" + sdfaa.format(new Date()) + (Double.valueOf(Math.random() * 1000).intValue()));
                            chargingOrderRefund.setRefundCode(refundCode);
                            chargingOrderRefund.setRefundAmount(refundAmount);
                            chargingOrderRefund.setRefundStatus(1);
                            chargingOrderRefund.setPayType(rechargePaymentType);
@@ -908,6 +923,11 @@
                                        .eq(TChargingOrder::getId, order.getId())
                                        .eq(TChargingOrder::getAppUserId, order.getAppUserId()));
                            } else if (1 == rechargePaymentType) {
                                Map<String, Object> objectMap = wxPaymentClient.queryRefund(refundCode).getData();
                                Map<String, Object> amount1 = null;
                                if(null != objectMap && null != objectMap.get("refund_id")){
                                    amount1 = (Map<String, Object>) objectMap.get("amount");
                                }else{
                                WxPaymentRefundModel model = new WxPaymentRefundModel();
                                model.setOut_trade_no(order.getCode());
                                model.setOut_refund_no(chargingOrderRefund.getRefundCode());
@@ -920,9 +940,11 @@
                                model.setAmount(amount);
                                R<Map<String, Object>> result = wxPaymentClient.refundOrderR(model);
                                if (200 == result.getCode()) {
                                        amount1 = (Map<String, Object>) result.getData().get("amount");
                                    }
                                }
                                if (null != amount1) {
                                    chargingOrderRefundService.save(chargingOrderRefund);
                                    //???
                                    Map<String, Object> amount1 = (Map<String, Object>) result.getData().get("amount");
                                    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);

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java

@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;

@@ -125,6 +126,10 @@
    @PostMapping(value = "queryRefund")
    public R<Map<String, Object>> queryRefund(@RequestParam("refund_out_trade_no") String refund_out_trade_no) {
        Map<String, Object> result = wxV3Pay.queryRefund(refund_out_trade_no);
        if(null == result){
            result = new HashMap<>();
            return R.ok(result);
        }
        log.info("订单退款查询结果：{}", result);
        // 微信支付退款单号
        String refund_id = result.get("refund_id").toString();