h5支付修改

xuhy

23 小时以前 dfc4a0dddf37569a22ff7da57ff3d6ec7ede4410

h5支付修改

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

@@ -1026,7 +1026,7 @@
            }
            if(3 == rechargePaymentType){
                RefundReq dto = new RefundReq();
                dto.setOutTradeNo(chargingOrder.getCode());
                dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
                dto.setOutRequestNo(chargingOrderRefund.getCode());
                dto.setRefundAmount(rechargeAmount.toString());
                dto.setRefundReason("充电失败，取消充电订单");
@@ -1123,7 +1123,7 @@
            }
            if(3 == rechargePaymentType){
                RefundReq dto = new RefundReq();
                dto.setOutTradeNo(chargingOrder.getCode());
                dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
                dto.setOutRequestNo(chargingOrderRefund.getCode());
                dto.setRefundAmount(money.toString());
                dto.setRefundReason("充电完成退款");
@@ -2723,7 +2723,7 @@
                }
                if(3 == rechargePaymentType){
                    RefundReq dto = new RefundReq();
                    dto.setOutTradeNo(chargingOrder.getCode());
                    dto.setOutTradeNo(chargingOrder.getRechargeSerialNumber());
                    dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
                    dto.setRefundAmount(refundAmount.toString());
                    dto.setRefundReason("充电完成退款");
@@ -2936,7 +2936,7 @@
                }
                if(3 == tChargingOrder.getRechargePaymentType()){
                    RefundReq dto = new RefundReq();
                    dto.setOutTradeNo(tChargingOrder.getCode());
                    dto.setOutTradeNo(tChargingOrder.getRechargeSerialNumber());
                    dto.setOutRequestNo(tChargingOrder.getCode());
                    dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
                    dto.setRefundReason("取消订单");
@@ -3016,20 +3016,20 @@
                        shoppingOrderRefundService.save(chargingOrderRefund);
                    }
                }
                if(3 == tChargingOrder.getPaymentType()){
                    RefundReq dto = new RefundReq();
                    dto.setOutTradeNo(tChargingOrder.getCode());
                    dto.setOutRequestNo(tChargingOrder.getCode());
                    dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
                    dto.setRefundReason("取消订单");
                    RefundResp resp = h5AliPaymentClient.refund(dto).getData();
                    if(null != resp){
                        tChargingOrder.setRefundStatus(2);
                        tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                        shoppingOrderService.updateById(tChargingOrder);
                        shoppingOrderRefundService.save(chargingOrderRefund);
                    }
                }
//                if(3 == tChargingOrder.getPaymentType()){
//                    RefundReq dto = new RefundReq();
//                    dto.setOutTradeNo(tChargingOrder.getCode());
//                    dto.setOutRequestNo(tChargingOrder.getCode());
//                    dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
//                    dto.setRefundReason("取消订单");
//                    RefundResp resp = h5AliPaymentClient.refund(dto).getData();
//                    if(null != resp){
//                        tChargingOrder.setRefundStatus(2);
//                        tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
//                        shoppingOrderService.updateById(tChargingOrder);
//                        shoppingOrderRefundService.save(chargingOrderRefund);
//                    }
//                }

            }

@@ -3095,20 +3095,20 @@
                    vipOrderRefundService.save(chargingOrderRefund);
                }
            }
            if(3 == tChargingOrder.getPaymentType()){
                RefundReq dto = new RefundReq();
                dto.setOutTradeNo(tChargingOrder.getCode());
                dto.setOutRequestNo(tChargingOrder.getCode());
                dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
                dto.setRefundReason("取消订单");
                RefundResp resp = h5AliPaymentClient.refund(dto).getData();
                if(null != resp){
                    tChargingOrder.setRefundStatus(2);
                    tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
                    vipOrderService.updateById(tChargingOrder);
                    vipOrderRefundService.save(chargingOrderRefund);
                }
            }
//            if(3 == tChargingOrder.getPaymentType()){
//                RefundReq dto = new RefundReq();
//                dto.setOutTradeNo(tChargingOrder.getCode());
//                dto.setOutRequestNo(tChargingOrder.getCode());
//                dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
//                dto.setRefundReason("取消订单");
//                RefundResp resp = h5AliPaymentClient.refund(dto).getData();
//                if(null != resp){
//                    tChargingOrder.setRefundStatus(2);
//                    tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
//                    vipOrderService.updateById(tChargingOrder);
//                    vipOrderRefundService.save(chargingOrderRefund);
//                }
//            }
        }
        return R.ok();
    }