From 49e96cc15baf35d710fe3a049fb97aff6a1af132 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 二月 2025 19:35:33 +0800
Subject: [PATCH] 修改分佣逻辑

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
index 7ffacb2..f43c09e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
@@ -32,9 +32,11 @@
     R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
 
     @PostMapping("/order/byUserId")
-    R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Long shopId);
+    R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId);
     @PostMapping("/order/byShopId")
     R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId);
+    @PostMapping("/order/byShopIdAndUserId")
+    R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId);
 
 
     /**
@@ -61,4 +63,9 @@
     R<Price> getGoodsPrice(@RequestParam("appUserId") Long appUserId, @RequestParam("goodsId") Integer goodsId, @RequestParam("shopId") Integer shopId);
     @PostMapping("/order/getLastOrder")
     R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId);
+
+
+    @PostMapping("/order-good/getUnDistributedOrder")
+    R<List<OrderGood>> getUnDistributedOrder(@RequestBody List<Long> appUserIds);
+
 }

--
Gitblit v1.7.1