From 627a1768b5953a01ff3df44532e75a0bb758c1dd Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 18 七月 2023 17:17:47 +0800
Subject: [PATCH] Merge branch 'master-fwq积分限购' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java | 16 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java | 5 +++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
new file mode 100644
index 0000000..d478951
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.activity;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 闄愬埗
+ */
+@Data
+public class ActivityLimitDto extends PageDto {
+ /**id*/
+ private String id;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+}
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 c6b4d59..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,13 +31,13 @@
* 鏍规嵁鍟嗗搧id鏌ヨ璁㈠崟鏁伴噺
*/
@PostMapping(value = "/order/numByGoodsId")
- Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId,@RequestParam("userId") String userId);
+ Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);
/**
* 鏍规嵁娲诲姩id鏌ヨ璁㈠崟鏁伴噺
*/
@PostMapping(value = "/order/numByActivityId")
- Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId,@RequestParam("userId") String userId);
+ Result queryOrderNumByActivityId(@RequestBody ActivityLimitDto activityLimitDto);
/**
* 璁㈠崟鍒楄〃
--
Gitblit v1.8.0