From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
index 81c55c8..4d7180f 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
@@ -21,11 +21,13 @@
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
+import com.doumee.dao.web.request.goods.OrderPayConfirmRequest;
import com.doumee.dao.web.response.MemberCouponResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.OrderCommentResponse;
import com.doumee.dao.web.response.OrderDetailResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
+import com.doumee.dao.web.response.goods.OrderPayConfirmResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.service.business.HotCityService;
import com.doumee.service.business.impl.MemberCouponServiceImpl;
@@ -34,13 +36,16 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -54,6 +59,10 @@
@RequestMapping("/web/orders")
@Slf4j
public class OrderApi extends ApiController {
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
@LoginRequired
@ApiOperation("鍜栧暋璁″垝宸茶闃呭垪琛�")
@PostMapping("/planOrdersPage")
@@ -154,7 +163,11 @@
})
public ApiResponse<PayResponse> orderPay(@Valid @RequestBody ShopOrderPayRequest request) {
request.setMemberId(getMemberId());
- return ApiResponse.success("鎿嶄綔鎴愬姛", goodsorderService.orderPay(request, memberCouponServiceImpl));
+ PayResponse payResponse = goodsorderService.orderPay(request, memberCouponServiceImpl);
+ if(Objects.nonNull(payResponse)&&StringUtils.isNotBlank(payResponse.getLockKey())){
+ redisTemplate.delete(payResponse.getLockKey());
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛", payResponse);
}
@LoginRequired
@@ -163,7 +176,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<PayResponse> orderPay(@RequestParam Integer orderId) {
+ public ApiResponse<PayResponse> replayPay(@RequestParam Integer orderId) {
return ApiResponse.success("鎿嶄綔鎴愬姛", goodsorderService.replayPay(orderId));
}
@@ -288,6 +301,20 @@
}
@LoginRequired
+ @ApiOperation("璁㈠崟寰呮敮浠樹俊鎭�")
+ @PostMapping("/orderPayConfirm")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<OrderPayConfirmResponse> orderPayConfirm(@RequestBody OrderPayConfirmRequest request) {
+ request.setMemberId(getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.orderPayConfirm(request,memberCouponServiceImpl));
+ }
+
+
+
+
+ @LoginRequired
@ApiOperation("璁㈠崟缁熻")
@GetMapping("/ordersStatistics")
@ApiImplicitParams({
@@ -297,6 +324,11 @@
return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.ordersStatistics(getMemberId()));
}
+
+
+
+
+
@LoginRequired
@ApiOperation("鐗╂祦鏌ヨ")
@GetMapping("/queryExpress")
--
Gitblit v1.9.3