From 35735b623ef913c1df2686530b9e81ca5ab05265 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 29 十月 2024 15:09:35 +0800
Subject: [PATCH] 订单管理：全部订单数量-待付款-已取消-已退款
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index c79d7e6..75ffe19 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -469,6 +469,7 @@
}
});
+ /* 替换支付修改
WxMaJscode2SessionResult session = null;
try {
session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -479,6 +480,7 @@
if (StringUtils.isBlank(openId)) {
throw new ValidationException("微信登录失败");
}
+ */
Address address = addressMapper.selectById(dto.getAddressId());
List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
@@ -532,7 +534,7 @@
}
totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
- totalAmount = new BigDecimal(0.01);
+ totalAmount = new BigDecimal("0.01");
}
order.setTotalAmount(totalAmount);
@@ -609,7 +611,7 @@
}
order.setOrderNo(getOrderNo());
- order.setPayOpenid(openId);
+ //order.setPayOpenid(openId);替换支付修改
orderMapper.insert(order);
//处理积分商品兑换券
@@ -624,10 +626,7 @@
}
}
- Map map = paymentSybService.prepay(order);
- map.put("_testV2OrderId", order.getId());
-
- return map;
+ return paymentSybService.prepay(order);
}
private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
--
Gitblit v1.9.3