From 7e4852e4b12f5728e11e9c50caa96d3aba3786ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 13:04:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
index ec1fd88..1b58143 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
@@ -7,6 +7,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@@ -20,6 +22,15 @@
*/
@PostMapping(value = "/goods/limit")
Result getLimitInfo(@RequestParam("limitId") String limitId);
+
+
+ /**
+ * 鑾峰彇闄愯喘鏁伴噺
+ * @param commonId 鍏叡鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/goods/limit/one")
+ Result getLimitTotal(@RequestParam("commonId") String commonId);
/**
* 鑾峰彇骞冲彴闄愬埗淇℃伅
@@ -39,6 +50,15 @@
Result getShopLimit(@RequestParam("limitId") String limitId, @RequestParam("shopId") String shopId);
/**
+ * 鑾峰彇鐢ㄦ埛绫诲埆搴楅檺鍒朵俊鎭�
+ * @param limitId 鍟嗗搧鏍囪瘑
+ * @param userHisId 鐢ㄦ埛id
+ * @return Result
+ */
+ @PostMapping(value = "/goods/userType/limit")
+ Result getUserTypeLimit(@RequestParam("limitId") String limitId, @RequestParam("userHisId") String userHisId);
+
+ /**
* 鑾峰彇鍟嗗搧浼氬憳闄愬埗淇℃伅
* @param limitId 鍟嗗搧鏍囪瘑
* @param userId 鐢ㄦ埛鏍囪瘑
@@ -54,4 +74,14 @@
/**鏌ヨ鏄惁鍙笂鏋�*/
@PostMapping(value = "/goods/check/limit")
Result getCheckSku(@RequestBody LimitDto limitDto);
+
+
+ /**
+ * 鍟嗗搧鏍囪瘑鏁扮粍鑾峰彇闂ㄥ簵鏁扮粍
+ * @param skuIds 鍟嗗搧鏍囪瘑鏁扮粍
+ * @return Result
+ */
+ @PostMapping(value = "/goods/shop/ids")
+ Result getShopHisIds(@RequestBody List<String> skuIds);
+
}
\ No newline at end of file
--
Gitblit v1.8.0