From 0f7c14b0e1048ac5284193f362ba10ae0791ffde Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 三月 2025 09:16:51 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
index adacb14..4a207d9 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
@@ -107,8 +107,19 @@
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", required = true),
})
public R<String> queryPayment(@RequestParam(value = "orderId") String orderId) throws Exception {
- JSONObject jsonObject = JuHeFuUtil.queryPayment(orderId);
- return R.ok(jsonObject.getString("status"));
+ Order byId = orderService.getById(orderId);
+ if (byId==null){
+ return R.fail("订单失效");
+ }
+ if (byId.getPaymentStatus()==2){
+ return R.ok("succeeded");
+ }else if (byId.getPaymentStatus()==1){
+ return R.fail("pending");
+ }else{
+ return R.fail("failed");
+ }
+
+
}
@GetMapping("/getMeditationIsBuyAll/{id}")
public R<List<Order>> getMeditationIsBuyAll(@PathVariable("id")Long id) {
@@ -363,6 +374,13 @@
return R.tokenError("登录失效");
}
Long userId = loginUser.getUserid();
+ AppUser data2 = remoteAppUserService.getAppUserById(userId + "").getData();
+ if (data2==null){
+ return R.tokenError("登录失效");
+ }else if (!StringUtils.hasLength(data2.getCellPhone())){
+ return R.tokenError("登录失效");
+ }
+
try {
if (orderId!=null){
Order order = orderService.getById(orderId);
--
Gitblit v1.7.1