Commit 89563018 by Jony.L

修复客户端“我的订单”界面费用显示问题

parent e1c58c98
...@@ -37,7 +37,7 @@ public class AppResourceOrderRespVO { ...@@ -37,7 +37,7 @@ public class AppResourceOrderRespVO {
private String categoryName; private String categoryName;
@Schema(description = "支付价格,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "888800") @Schema(description = "支付价格,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "888800")
private Integer payPrice; private Long paymentPrice;
@Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long payOrderId; private Long payOrderId;
......
...@@ -372,6 +372,7 @@ public class ResourceOrderServiceImpl implements ResourceOrderService { ...@@ -372,6 +372,7 @@ public class ResourceOrderServiceImpl implements ResourceOrderService {
respVO.setRam(snapshot.getRam()); respVO.setRam(snapshot.getRam());
respVO.setStorage(snapshot.getStorage()); respVO.setStorage(snapshot.getStorage());
respVO.setPowerSupply(snapshot.getPowerSupply()); respVO.setPowerSupply(snapshot.getPowerSupply());
respVO.setPaymentPrice(snapshot.getPaymentPrice());
respVO.setNic(snapshot.getNic()); respVO.setNic(snapshot.getNic());
respVO.setIp(snapshot.getIp()); respVO.setIp(snapshot.getIp());
respVO.setSkuName(snapshot.getSpuName() + " - " + snapshot.getDurationDays() + "天"); respVO.setSkuName(snapshot.getSpuName() + " - " + snapshot.getDurationDays() + "天");
...@@ -542,6 +543,8 @@ public class ResourceOrderServiceImpl implements ResourceOrderService { ...@@ -542,6 +543,8 @@ public class ResourceOrderServiceImpl implements ResourceOrderService {
AppWpgjPayOrderSubmitRespVO payRespVO = null; AppWpgjPayOrderSubmitRespVO payRespVO = null;
if (order.getPaymentPrice() > 0) { if (order.getPaymentPrice() > 0) {
payRespVO = createWpgjPayOrder(order); payRespVO = createWpgjPayOrder(order);
// 确保 order 对象的 payOrderId 字段被正确设置
order.setPayOrderId(payRespVO.getId());
} else { } else {
// 如果价格为0,返回成功状态,使用资源订单ID // 如果价格为0,返回成功状态,使用资源订单ID
payRespVO = new AppWpgjPayOrderSubmitRespVO(); payRespVO = new AppWpgjPayOrderSubmitRespVO();
...@@ -549,6 +552,8 @@ public class ResourceOrderServiceImpl implements ResourceOrderService { ...@@ -549,6 +552,8 @@ public class ResourceOrderServiceImpl implements ResourceOrderService {
payRespVO.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); payRespVO.setStatus(PayOrderStatusEnum.SUCCESS.getStatus());
// 价格为0时,用订单ID作为payOrderId // 价格为0时,用订单ID作为payOrderId
order.setPayOrderId(order.getId()); order.setPayOrderId(order.getId());
// 更新数据库中的payOrderId
resourceOrderMapper.updateById(new ResourceOrderDO().setId(order.getId()).setPayOrderId(order.getId()));
} }
// 4. 创建订单硬件配置快照,保存下单时的配置信息 // 4. 创建订单硬件配置快照,保存下单时的配置信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment