You've already forked FrameTour-BE
refactor(order): 重构订单创建和支付参数获取逻辑
- 新增 createOrderCompact 方法实现旧版订单创建逻辑 - 新增 getPaymentParams 方法获取支付参数 - 更新 AppOrderV2Controller调用新的订单创建和支付参数获取方法 - 在 OrderMapper 中添加 getOrderItems 方法获取订单详情- 更新 VideoRepository 接口,增加根据人脸和模板 ID 获取视频列表的方法 - 在 OrderServiceImpl 中实现新的订单创建和支付参数获取逻辑 - 更新 OrderService 接口,添加新的方法声明 - 在 OrderMapper.xml 中添加新的 SQL 查询语句
This commit is contained in:
@@ -2,6 +2,8 @@ package com.ycwl.basic.controller.mobile;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.ycwl.basic.constant.BaseContextHandler;
|
||||
import com.ycwl.basic.model.pc.order.req.CreateOrderReqVO;
|
||||
import com.ycwl.basic.service.pc.OrderService;
|
||||
import com.ycwl.basic.utils.ApiResponse;
|
||||
import com.ycwl.basic.pricing.dto.*;
|
||||
import com.ycwl.basic.pricing.service.IPriceCalculationService;
|
||||
@@ -37,6 +39,7 @@ public class AppOrderV2Controller {
|
||||
private final FaceService faceService;
|
||||
private final PriceCacheService priceCacheService;
|
||||
private final IOrderService orderService;
|
||||
private final OrderService oldOrderService;
|
||||
|
||||
/**
|
||||
* 移动端价格计算
|
||||
@@ -166,20 +169,28 @@ public class AppOrderV2Controller {
|
||||
|
||||
log.info("价格缓存验证通过: userId={}, scenicId={}, finalAmount={}",
|
||||
currentUserId, scenicId, cachedResult.getFinalAmount());
|
||||
|
||||
// 创建订单
|
||||
|
||||
// 使用旧版创建订单逻辑
|
||||
try {
|
||||
Long orderId = orderService.createOrder(request, currentUserId, scenicId, cachedResult);
|
||||
|
||||
log.info("移动端订单创建成功: orderId={}, userId={}, scenicId={}, finalAmount={}",
|
||||
orderId, currentUserId, scenicId, cachedResult.getFinalAmount());
|
||||
|
||||
return ApiResponse.success(orderId.toString());
|
||||
|
||||
Long orderId = oldOrderService.createOrderCompact(currentUserId, request, cachedResult);
|
||||
return ApiResponse.success(String.valueOf(orderId));
|
||||
} catch (Exception e) {
|
||||
log.error("订单创建失败: userId={}, scenicId={}, error={}", currentUserId, scenicId, e.getMessage(), e);
|
||||
return ApiResponse.fail("订单创建失败,请稍后重试");
|
||||
}
|
||||
|
||||
// 创建订单
|
||||
// try {
|
||||
// Long orderId = orderService.createOrder(request, currentUserId, scenicId, cachedResult);
|
||||
//
|
||||
// log.info("移动端订单创建成功: orderId={}, userId={}, scenicId={}, finalAmount={}",
|
||||
// orderId, currentUserId, scenicId, cachedResult.getFinalAmount());
|
||||
//
|
||||
// return ApiResponse.success(orderId.toString());
|
||||
//
|
||||
// } catch (Exception e) {
|
||||
// log.error("订单创建失败: userId={}, scenicId={}, error={}", currentUserId, scenicId, e.getMessage(), e);
|
||||
// return ApiResponse.fail("订单创建失败,请稍后重试");
|
||||
// }
|
||||
}
|
||||
|
||||
// ====== 新增移动端订单查询功能 ======
|
||||
@@ -264,14 +275,17 @@ public class AppOrderV2Controller {
|
||||
Long currentUserId = Long.valueOf(currentUserIdStr);
|
||||
|
||||
log.info("获取支付参数: userId={}, orderId={}", currentUserId, orderId);
|
||||
|
||||
try {
|
||||
PaymentParamsResponse response = orderService.getPaymentParams(orderId, currentUserId, request);
|
||||
return ApiResponse.success(response);
|
||||
} catch (Exception e) {
|
||||
log.error("获取支付参数失败: userId={}, orderId={}", currentUserId, orderId, e);
|
||||
return ApiResponse.fail(e.getMessage());
|
||||
}
|
||||
|
||||
return oldOrderService.getPaymentParams(orderId, currentUserId, request);
|
||||
|
||||
//
|
||||
// try {
|
||||
// PaymentParamsResponse response = orderService.getPaymentParams(orderId, currentUserId, request);
|
||||
// return ApiResponse.success(response);
|
||||
// } catch (Exception e) {
|
||||
// log.error("获取支付参数失败: userId={}, orderId={}", currentUserId, orderId, e);
|
||||
// return ApiResponse.fail(e.getMessage());
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user