From 111652d23733d04e379c2454c8b39171596a6b50 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 14:28:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
index 8eb0d71..55b0678 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
@@ -91,6 +91,7 @@
AppUser appUser = getAppUserById(userId);
ClientPlaceOrderVO clientPlaceOrderVO = new ClientPlaceOrderVO();
Order order = new Order();
+ order.setPayType(payType);
// 购买冥想音频
if (orderFrom == 1) {
Meditation meditation = remoteMeditationService.getMeditationById(targetId,
@@ -104,8 +105,10 @@
order.setBizOrderNo(orderNo);
order.setBusinessId(meditation.getId());
order.setAppUserId(userId);
-
+ order.setRealPayAmount(meditation.getGeneralPrice());
+ order.setPayType(payType);
order.setTotalAmount(meditation.getGeneralPrice());
+ order.setGiveUserId(receiverId);
this.save(order);
Long orderId = order.getId();
clientPlaceOrderVO.setOrderNo(orderNo);
@@ -154,6 +157,7 @@
order.setGiveUserId(receiverId);
order.setBusinessId(course.getId());
order.setAppUserId(userId);
+ order.setRealPayAmount(course.getGeneralPrice());
order.setTotalAmount(course.getGeneralPrice());
this.save(order);
Long orderId = order.getId();
@@ -281,9 +285,7 @@
* @return AppUser
*/
private AppUser getAppUserById(Long userId) {
- return remoteAppUserService.getUserByCondition(
- AppUserDTO.builder().id(userId).build(),
- SecurityConstants.INNER).getData();
+ return remoteAppUserService.getAppUserById(userId+"").getData();
}
/**
@@ -308,7 +310,7 @@
// 调用第三方支付获取支付信息
JSONObject payInfo = JuHeFuUtil.createPayment1(orderNo, payType,
needPayAmount.toString(), goodsTitle, goodsDesc,
- IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback");
+ IpUtils.getIpAddr(), wxOpenId, "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
// 第三方支付记录
OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
paymentRecord.setOrderId(orderId);
@@ -330,7 +332,7 @@
// 调用第三方支付获取支付信息
JSONObject payInfo = JuHeFuUtil.createPayment(orderNo, payType,
needPayAmount.toString(), goodsTitle, goodsDesc,
- IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback");
+ IpUtils.getIpAddr(), wxOpenId, "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
// 第三方支付记录
OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
paymentRecord.setOrderId(orderId);
--
Gitblit v1.7.1