From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
index 68b65fa..a225a8e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
@@ -1,13 +1,11 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
+import com.hz.phis.vo.order.OrderActivityCountVo;
import com.hz.phis.vo.order.OrderActivityVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
/**璁㈠崟娲诲姩鏌ヨ
* @author CJH
@@ -16,11 +14,19 @@
public interface SOrderActivityService {
/**
- * 鏍规嵁娲诲姩缂栫爜鏌ヨ璁㈠崟鏄惁宸茬粡鎵ц
+ * 鏍规嵁娲诲姩缂栫爜鏌ヨ鏄惁鎵ц+鏄惁娑堣垂+璧犻�佹暟鎹�
* @param orderActivityVo 瀵硅薄
* @return Result 浣跨敤OrderActivityReturnVo杞寲
*/
@PostMapping(value = "/order/activity/execute")
Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo);
+ /**
+ * 鑾峰彇鐢ㄦ埛娲诲姩杩旇禒鐨勬暟鎹�
+ * @param orderActivityVo 瀵硅薄
+ * @return Result 浣跨敤OrderActivityReturnVo杞寲
+ */
+ @PostMapping(value = "/order/activity/increment/money")
+ Result getActivityReturn(@RequestBody OrderActivityCountVo orderActivityVo);
+
}
--
Gitblit v1.8.0