From e2659d65be6494f9f737cddcec8292ac39cc5c06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 23:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index c3f726e..94410aa 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -61,7 +61,7 @@
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
- wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getOrderFrom,4);
wrapper.eq(Order::getAuctionOrderType,2 );
wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
wrapper.eq(Order::getDelFlag,0);
@@ -133,6 +133,13 @@
R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
}
+ @InnerAuth
+ @ResponseBody
+ @PostMapping("/getOrderByGroupPurchaseMemberId1")
+ R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
+ return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
+ }
+
@InnerAuth
@ResponseBody
--
Gitblit v1.7.1