Merge remote-tracking branch 'origin/2.0' into 2.0

“mitao”

2026-05-07 2182fb521701539d4327d18105c7e5b6e9fd42f6

Merge remote-tracking branch 'origin/2.0' into 2.0

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/ExchangeCodeConsumeDTO.java

@@ -19,6 +19,6 @@
    @ApiModelProperty("扣减金额")
    private BigDecimal amount;

    @ApiModelProperty("????/?????")
    @ApiModelProperty("退款编号")
    private String refundNo;
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java

@@ -163,7 +163,7 @@
            }
            @Override
            public R<ExchangeCodeConsumeResultVO> refundExchangeCodeBalance(ExchangeCodeConsumeDTO dto) {
                return R.fail("?????????:" + throwable.getMessage());
                return R.fail("退还兑换码余额失败:" + throwable.getMessage());
            }

            @Override

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

@@ -454,7 +454,7 @@
        consumeDTO.setAmount(consumeAmount);
        R<ExchangeCodeConsumeResultVO> result = otherClient.consumeExchangeCodeBalance(consumeDTO);
        if (result == null || result.getCode() != 200) {
            throw new RuntimeException("??????????");
            throw new RuntimeException("扣减兑换码余额失败");
        }
    }

@@ -470,7 +470,7 @@
        refundDTO.setRefundNo(refundNo);
        R<ExchangeCodeConsumeResultVO> result = otherClient.refundExchangeCodeBalance(refundDTO);
        if (result == null || result.getCode() != 200) {
            throw new RuntimeException("??????????");
            throw new RuntimeException("退还兑换码余额失败");
        }
    }


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

@@ -172,7 +172,7 @@
        refundDTO.setRefundNo(refundNo);
        R<ExchangeCodeConsumeResultVO> result = otherClient.refundExchangeCodeBalance(refundDTO);
        if (result == null || result.getCode() != 200) {
            throw new RuntimeException("??????????");
            throw new RuntimeException("退还兑换码余额失败");
        }
    }

@@ -681,7 +681,7 @@
                        //用户推荐奖励
                        chargingOrderService.referralReward(order);

                        //????????
                         //开始构建退款费用
                        refundAmount = refundAmount.setScale(2, RoundingMode.HALF_EVEN);
                        if (refundAmount.compareTo(BigDecimal.ZERO) > 0) {
                            Integer rechargePaymentType = order.getRechargePaymentType();
@@ -693,7 +693,7 @@
                            order.setRefundAmount(refundAmount);
                            order.setRefundStatus(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 2);
                            chargingOrderService.updateById(order);
                            //??????
                            //构建退款明细
                            TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
                            chargingOrderRefund.setChargingOrderId(order.getId());
                            SimpleDateFormat sdfaa = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -702,17 +702,17 @@
                            chargingOrderRefund.setRefundStatus(1);
                            chargingOrderRefund.setPayType(rechargePaymentType);
                            chargingOrderRefund.setCode(order.getCode());
                            chargingOrderRefund.setRefundTitle("??????");
                            chargingOrderRefund.setRefundContent("??????");
                            chargingOrderRefund.setRefundReason("??????");
                            chargingOrderRefund.setRefundRemark("?????????" + order.getPaymentAmount());
                            chargingOrderRefund.setRefundTitle("充电完成退款");
                            chargingOrderRefund.setRefundContent("充电完成退款");
                            chargingOrderRefund.setRefundReason("充电完成退款");
                            chargingOrderRefund.setRefundRemark("实际充电消费金额：" + order.getPaymentAmount());
                            chargingOrderRefund.setRefundTotalAmount(refundAmount);
                            chargingOrderRefund.setPayAmount(rechargeAmount);
                            if (thirdRefundAmount.compareTo(BigDecimal.ZERO) > 0 && 1 == rechargePaymentType) {
                                WxPaymentRefundModel model = new WxPaymentRefundModel();
                                model.setOut_trade_no(order.getCode());
                                model.setOut_refund_no(chargingOrderRefund.getRefundCode());
                                model.setReason("??????");
                                model.setReason("充电完成退款");
                                model.setNotify_url("/payment/wx/refund/notify");
                                WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
                                amount.setRefund(thirdRefundAmount.multiply(new BigDecimal(100)).intValue());
@@ -735,7 +735,7 @@
                                dto.setOutTradeNo(order.getCode());
                                dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
                                dto.setRefundAmount(thirdRefundAmount.toString());
                                dto.setRefundReason("??????");
                                dto.setRefundReason("充电完成退款");
                                RefundResp resp = aliPaymentClient.refund(dto).getData();
                                if (null != resp) {
                                    chargingOrderRefundService.save(chargingOrderRefund);
@@ -747,7 +747,7 @@
                                dto.setOutTradeNo(order.getRechargeSerialNumber());
                                dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
                                dto.setRefundAmount(thirdRefundAmount.toString());
                                dto.setRefundReason("??????");
                                dto.setRefundReason("充电完成退款");
                                RefundResp resp = h5AliPaymentClient.refund(dto).getData();
                                if (null != resp && "10000".equals(resp.getCode())) {
                                    chargingOrderRefundService.save(chargingOrderRefund);

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TExchangeCodePackageController.java

@@ -289,7 +289,7 @@
     * @return 退款结果
     */
    @PostMapping("/refundBalance")
    @ApiOperation(value = "?????????", tags = {"??-???"})
    @ApiOperation(value = "退还兑换码余额", tags = {"小程序-兑换码"})
    public R<ExchangeCodeConsumeResultVO> refundBalance(@RequestBody ExchangeCodeConsumeDTO dto) {
        return R.ok(exchangeCodePackageService.refundBalance(dto));
    }

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TExchangeCodePackageServiceImpl.java

@@ -547,7 +547,7 @@
    @Transactional(rollbackFor = Exception.class)
    public ExchangeCodeConsumeResultVO refundBalance(ExchangeCodeConsumeDTO dto) {
        if (dto == null || dto.getUserId() == null || dto.getOrderId() == null || dto.getAmount() == null) {
            throw new ServiceException("????????");
            throw new ServiceException("参数异常");
        }
        ExchangeCodeConsumeResultVO resultVO = new ExchangeCodeConsumeResultVO();
        BigDecimal remainingRefund = dto.getAmount().setScale(2, RoundingMode.HALF_UP);