From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java | 16 ++++++++++++++--
1 files changed, 14 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 3db0288..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,6 +22,7 @@
/**
* 璁㈠崟璇︽儏
+ * 杞崲鐢∣rderDetailDt
*/
@PostMapping(value = "/order/detail")
Result orderDetail(@RequestParam("orderId") String orderId);
@@ -29,13 +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