From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java | 27 +++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 2 +-
3 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
new file mode 100644
index 0000000..cd2508f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.card;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍗″寘鎵╁睍
+ *
+ * @author fwq
+ */
+@Data
+public class CardBagDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鍗″寘鏍囪瘑*/
+ private String cardBagId;
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String opEmployeeId;
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+ private String opShopId;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+ /**澶囨敞*/
+ private String remarks;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
new file mode 100644
index 0000000..ba67f69
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activity.ActivityDto;
+import com.hz.his.dto.card.CardBagDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-card")
+public interface SPhipUserCardService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘鍒楄〃
+ */
+ @PostMapping(value = "/user/card/cardBag/list")
+ Result cardBagList(@RequestBody CardBagDto cardBagDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘寤舵湡
+ */
+ @PostMapping(value = "/user/card/delay/cardBag")
+ Result delayCardBag(@RequestBody CardBagDto cardBagDto);
+
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index d48a502..80db877 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -69,7 +69,7 @@
private String email;
/**澶村儚*/
private String imgUrl;
-
+ private String hisId;
private String userBelongingType;
private String hisId;
--
Gitblit v1.8.0