liujie
昨天 cd31c1b504f19c0193d453b25d188256543198cb
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1031,7 +1031,7 @@
            dto.setRefundAmount(rechargeAmount.toString());
            dto.setRefundReason("充电失败,取消充电订单");
            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
            if(null != resp){
            if(null != resp && "10000".equals(resp.getCode())){
               chargingOrderRefundService.save(chargingOrderRefund);
               //回退会员折扣次数
               if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
@@ -1128,7 +1128,7 @@
            dto.setRefundAmount(money.toString());
            dto.setRefundReason("充电完成退款");
            RefundResp resp = h5AliPaymentClient.refund(dto).getData();
            if(null != resp){
            if(null != resp && "10000".equals(resp.getCode())){
               chargingOrderRefundService.save(chargingOrderRefund);
               try {
                  Thread.sleep(1000);
@@ -2728,7 +2728,7 @@
               dto.setRefundAmount(refundAmount.toString());
               dto.setRefundReason("充电完成退款");
               RefundResp resp = h5AliPaymentClient.refund(dto).getData();
               if(null != resp){
               if(null != resp && "10000".equals(resp.getCode())){
                  chargingOrderRefundService.save(chargingOrderRefund);
                  this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
               }
@@ -2941,7 +2941,7 @@
               dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
               dto.setRefundReason("取消订单");
               RefundResp resp = h5AliPaymentClient.refund(dto).getData();
               if(null != resp){
               if(null != resp && "10000".equals(resp.getCode())){
                  chargingOrderRefund.setRefundStatus(2);
                  chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                  this.baseMapper.updateById(tChargingOrder);