From fcfc7c0510592aade38d4ef84070e0445964334c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 01 四月 2024 18:57:06 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
index bc71485..85819f6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
@@ -1,6 +1,7 @@
 package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.activity.ActivityLimitDto;
 import com.hz.his.dto.order.OrderDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,17 +31,23 @@
      * 鏍规嵁鍟嗗搧id鏌ヨ璁㈠崟鏁伴噺
      */
     @PostMapping(value = "/order/numByGoodsId")
-    Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId);
+    Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);
 
     /**
      * 鏍规嵁娲诲姩id鏌ヨ璁㈠崟鏁伴噺
      */
     @PostMapping(value = "/order/numByActivityId")
-    Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId);
+    Result queryOrderNumByActivityId(@RequestBody ActivityLimitDto activityLimitDto);
 
     /**
      * 璁㈠崟鍒楄〃
      */
     @PostMapping(value = "/order/deta/all")
     Result getOrderDetasAll(@RequestBody OrderDto orderDto);
+
+    /**
+     * 璁㈠崟鍒楄〃
+     */
+    @PostMapping(value = "/getOrderCustomerConfirm")
+    Result getOrderCustomerConfirm(@RequestBody OrderDto orderDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0