From 353cf91d3679e68d9b8c07652e4f7791d606dbd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:14:39 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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 bde9770..b52f0b0 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
@@ -108,11 +108,13 @@
                 order.setAppUserId(userId);
                 order.setRealPayAmount(meditation.getGeneralPrice());
                 order.setPayType(payType);
+                order.setBuyContent("购买疗愈【"+meditationTitle+"】");
                 order.setTotalAmount(meditation.getGeneralPrice());
                 order.setGiveUserId(receiverId);
                 this.save(order);
             }else{
                  order = this.getById(orderId);
+                order.setBuyContent("购买疗愈【"+meditationTitle+"】");
             }
 
             Long orderId9 = order.getId();
@@ -128,6 +130,7 @@
                     // 抵扣后金额为0 为余额支付
                     order.setPayType(4);
                     order.setRealPayAmount(meditation.getGeneralPrice());
+                    order.setBuyContent("购买疗愈【"+meditationTitle+"】");
                     this.updateById(order);
                     return clientPlaceOrderVO;
                 }else{
@@ -146,6 +149,7 @@
                     // 支付宝+余额
                     order.setPayType(6);
                 }
+                order.setBuyContent("购买疗愈【"+meditationTitle+"】");
                 this.updateById(order);
                 // 创建支付订单
                 createPayment(payType, orderNo, needPayAmount, meditationTitle, detailDescription,
@@ -171,11 +175,14 @@
                 order.setGiveUserId(receiverId);
                 order.setBusinessId(course.getId());
                 order.setAppUserId(userId);
+                order.setBuyContent("购买课程【"+courseTitle+"】");
                 order.setRealPayAmount(course.getGeneralPrice());
                 order.setTotalAmount(course.getGeneralPrice());
                 this.save(order);
             }else{
                 order = this.getById(orderId);
+                order.setBuyContent("购买课程【"+courseTitle+"】");
+
             }
             Long orderId8 = order.getId();
             clientPlaceOrderVO.setOrderNo(orderNo);
@@ -191,6 +198,8 @@
                     // 抵扣后金额为0 为余额支付
                     order.setPayType(4);
                     order.setRealPayAmount(course.getGeneralPrice());
+                    order.setBuyContent("购买课程【"+courseTitle+"】");
+
                     this.updateById(order);
                     return clientPlaceOrderVO;
                 }else{
@@ -209,6 +218,8 @@
                     // 支付宝+余额
                     order.setPayType(6);
                 }
+                order.setBuyContent("购买课程【"+courseTitle+"】");
+
                 this.updateById(order);
                 // 创建支付订单
                 createPayment(payType, orderNo, needPayAmount, courseTitle, description,
@@ -336,7 +347,9 @@
             // 调用第三方支付获取支付信息
             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://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback")
+                    "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
             // 第三方支付记录
             OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
             paymentRecord.setOrderId(orderId);
@@ -358,7 +371,9 @@
             // 调用第三方支付获取支付信息
             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://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback")
+                    "https://xq.xqzhihui.com/api/order/client/order/order/base/callback");
             // 第三方支付记录
             OrderPaymentRecord paymentRecord = new OrderPaymentRecord();
             paymentRecord.setOrderId(orderId);
@@ -514,6 +529,7 @@
             order.setBizOrderNo(orderNo);
             order.setAppUserId(userId);
             order.setTotalAmount(amount);
+            order.setRealPayAmount(amount);
             String vipType1 ="";
             switch (vipType){
                 case 1:
@@ -549,6 +565,8 @@
             order.setBizOrderNo(orderNo);
             order.setAppUserId(userId);
             order.setTotalAmount(amount);
+            order.setRealPayAmount(amount);
+
             order.setBuyContent("充值");
             this.save(order);
             Long orderId = order.getId();

--
Gitblit v1.7.1