From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 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 4d13c27..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;
@@ -21,9 +22,32 @@
 
     /**
      * 璁㈠崟璇︽儏
+     * 杞崲鐢∣rderDetailDt
      */
     @PostMapping(value = "/order/detail")
     Result orderDetail(@RequestParam("orderId") String orderId);
 
+    /**
+     * 鏍规嵁鍟嗗搧id鏌ヨ璁㈠崟鏁伴噺
+     */
+    @PostMapping(value = "/order/numByGoodsId")
+    Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);
 
+    /**
+     * 鏍规嵁娲诲姩id鏌ヨ璁㈠崟鏁伴噺
+     */
+    @PostMapping(value = "/order/numByActivityId")
+    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