zhangchen пре 3 недеља
родитељ
комит
2a236af4b3

+ 21 - 20
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerClientConsultationOrderServiceImpl.java

@@ -632,26 +632,27 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
                 // 将订单金额从分转换为元(字符串格式,保留两位小数)
                 String refundAmount = String.format("%.2f", orderAmount / 100.0);
                 String refundReason = "律师取消订单";
-
-                try {
-                    // 调用退款接口(全退,partialRefundCode 传空字符串)
-                    String refundResult = alienStoreFeign.processRefund(orderNumber, refundAmount, refundReason, "");
-                    
-                    if ("调用成功".equals(refundResult)) {
-                        log.info("律师取消订单并退款成功,订单ID={}, 订单编号={}, 退款金额={}元",
-                                id, orderNumber, refundAmount);
-                        return R.data(true, "取消订单成功,退款已处理");
-                    } else {
-                        log.error("律师取消订单退款失败,订单ID={}, 订单编号={}, 退款结果={}",
-                                id, orderNumber, refundResult);
-                        // 退款失败,但订单状态已更新为已取消,返回警告信息
-                        return R.fail("订单已取消,但退款处理失败:" + refundResult);
-                    }
-                } catch (Exception e) {
-                    log.error("律师取消订单退款异常,订单ID={}, 订单编号={}", id, orderNumber, e);
-                    // 退款异常,但订单状态已更新为已取消,返回警告信息
-                    return R.fail("订单已取消,但退款处理异常:" + e.getMessage());
-                }
+                return R.data(true, "取消订单成功,退款已处理");
+
+//                try {
+//                    // 调用退款接口(全退,partialRefundCode 传空字符串)
+//                    String refundResult = alienStoreFeign.processRefund(orderNumber, refundAmount, refundReason, "");
+//
+//                    if ("调用成功".equals(refundResult)) {
+//                        log.info("律师取消订单并退款成功,订单ID={}, 订单编号={}, 退款金额={}元",
+//                                id, orderNumber, refundAmount);
+//                        return R.data(true, "取消订单成功,退款已处理");
+//                    } else {
+//                        log.error("律师取消订单退款失败,订单ID={}, 订单编号={}, 退款结果={}",
+//                                id, orderNumber, refundResult);
+//                        // 退款失败,但订单状态已更新为已取消,返回警告信息
+//                        return R.fail("订单已取消,但退款处理失败:" + refundResult);
+//                    }
+//                } catch (Exception e) {
+//                    log.error("律师取消订单退款异常,订单ID={}, 订单编号={}", id, orderNumber, e);
+//                    // 退款异常,但订单状态已更新为已取消,返回警告信息
+//                    return R.fail("订单已取消,但退款处理异常:" + e.getMessage());
+//                }
             } else {
                 // 未支付的订单,直接取消即可
                 log.info("律师取消订单成功(未支付订单无需退款),订单ID={}, 订单编号={}",