From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 8dfb209..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,28 @@
@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) {
+ List<Order> list = orderService.lambdaQuery()
+ .eq(Order::getAppUserId, id)
+ .eq(Order::getOrderFrom, 1)
+ .eq(Order::getPaymentStatus, 2)
+ .ne(Order::getRefundStatus, 3).list();
+ return R.ok(list);
}
@GetMapping("/getMeditationIsBuy/{id}/{meditationId}")
public R<Integer> getMeditationIsBuy(@PathVariable("id")Long id,@PathVariable("meditationId")Long meditationId) {
@@ -123,6 +143,7 @@
return R.ok(1);
}
}
+
@PostMapping("/payOrder")
@ApiOperation(value = "已购详情-待支付状态-页面数据",tags = "我的已购")
@ApiImplicitParams({
@@ -353,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