From bdd39fac56c367b36d6c41ef2cd5c9f35926013f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 15:07:50 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
index e59e3af..d680359 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
@@ -1,11 +1,10 @@
package com.hz.his.feign.service.platform;
+import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
-import com.hz.his.dto.card.CardQueryDto;
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;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -15,14 +14,19 @@
/**
* 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曡鎯�
+ * @param treatSingleId String绫诲瀷JsonObject
*/
- @PostMapping(value = "/treat/confirmTreatNotice")
- Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId);
+ @PostMapping(value = "/treat/info")
+ Result getTreatInfo(@RequestBody String treatSingleId);
/**
* 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曠‘璁�
+ * @param treatSingleId String绫诲瀷JsonObject
*/
@PostMapping(value = "/treat/confirmTreatNotice")
- Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId);
+ Result confirmTreat(@RequestBody String treatSingleId);
+ /** 鎵归噺鍒涘缓娌荤枟鍗� */
+ @PostMapping(value = "/treat/batch/add")
+ Result batchAdd(@RequestBody JSONObject dataJson);
}
\ No newline at end of file
--
Gitblit v1.8.0