From 523797c2e9e4e8934751327db754f1f77763f356 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 26 一月 2025 16:24:30 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 529ed9d..4a87d8c 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
@@ -21,6 +21,7 @@
import com.xinquan.order.service.OrderPaymentRecordService;
import com.xinquan.order.service.OrderService;
import com.xinquan.common.core.utils.JuHeFuUtil;
+import com.xinquan.order.utils.MD5Generator;
import com.xinquan.order.utils.OrderUtil;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.AppUserWalletRecord;
@@ -448,7 +449,10 @@
@Override
public String placeOrderApple(Long targetId, Integer orderFrom,
Long receiverId, Integer balanceFlag,
- BigDecimal amount, Integer vipType, String transactionIdentifier) {
+ BigDecimal amount, Integer vipType, String transactionIdentifier
+ ,String originTransactionIdentifier,String receipt) {
+// String s = MD5Generator.generateMD5(receipt);
+
// 获取当前登录用户id
Long userId = tokenService.getLoginUser().getUserid();
// 获取用户信息
@@ -494,6 +498,7 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
orderPaymentRecordService.save(paymentRecord);
}
@@ -507,6 +512,8 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
+
orderPaymentRecordService.save(paymentRecord);
}
}
@@ -548,6 +555,8 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
+
orderPaymentRecordService.save(paymentRecord);
}
} else {
@@ -560,6 +569,8 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
+
orderPaymentRecordService.save(paymentRecord);
}
}
@@ -586,7 +597,6 @@
order.setBuyContent(vipType1);
this.save(order);
Long orderId = order.getId();
-
order.setPayType(3);
this.updateById(order);
// 创建支付订单
@@ -596,6 +606,8 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
+
orderPaymentRecordService.save(paymentRecord);
}else {
// 充值
@@ -607,7 +619,6 @@
order.setAppUserId(userId);
order.setTotalAmount(amount);
order.setRealPayAmount(amount);
-
order.setBuyContent("充值");
this.save(order);
Long orderId = order.getId();
@@ -620,6 +631,7 @@
paymentRecord.setOrderId(orderId);
paymentRecord.setPaymentType(PaymentTypeEnum.IOS_PAY.getCode());
paymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_PAID.getCode());
+// paymentRecord.setReceipt(s);
orderPaymentRecordService.save(paymentRecord);
}
return order.getId()+"";
--
Gitblit v1.7.1