From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
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