From 662dbd2ae6328c227024d63116528fcc0710b037 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 15 二月 2023 12:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java |   30 ++++++++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java                              |   24 ++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
new file mode 100644
index 0000000..0ed302d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/questionnaire/SPhipRewardService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.questionnaire;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activity.ActivityDto;
+import com.hz.phis.dt.reward.RewardRecordDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-reward")
+public interface SPhipRewardService {
+
+    /**
+     * 鏌ヨ鎵撹祻鍟嗗搧
+     */
+    @PostMapping(value = "/questionnaire/reward-goods/list")
+    Result rewardGoodsList();
+
+
+    /**
+     * 鎵撹祻
+     */
+    @PostMapping(value = "/questionnaire/reward")
+    Result reward(List<RewardRecordDto> list);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
new file mode 100644
index 0000000..7f33780
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
@@ -0,0 +1,24 @@
+package com.hz.phis.dt.reward;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import lombok.Data;
+
+@Data
+public class RewardRecordDto {
+
+    private String goodsName;
+
+    private String goodsId;
+
+    private String employeeId;
+
+    private Integer deduIntegral;
+
+    private Integer number;
+
+    private Integer type;
+
+    private String commonId;
+
+    private String userId;
+}

--
Gitblit v1.8.0