From 1cc890a6f7432147c633e2cf7c3d4043460e85e9 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 20 十月 2023 18:42:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java | 3 +--
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
index 26cf3d1..b5f509f 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
@@ -9,6 +9,5 @@
**/
@Data
public class DConsumablesDto extends DCommonDto {
-
-
+ private Integer type;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java
new file mode 100644
index 0000000..1250d1e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java
@@ -0,0 +1,46 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.user.*;
+import com.hz.his.dto.user.card.UserCardDto;
+import com.hz.his.dto.user.card.UserCardUsedDto;
+import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
+import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.label.UserLabelDto;
+import com.hz.his.dto.user.money.*;
+import com.hz.his.dto.user.packages.UserPhisPackageDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.project.UserProjectUsedDto;
+import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
+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.util.List;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-visit")
+public interface SUserVisitService {
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏄惁鏈夊埌璁�
+ * */
+ @PostMapping(value = "/user/check")
+ Result check(@RequestBody UserDto userDto);
+
+
+
+ @PostMapping(value = "/user/query/visitCount")
+ Result queryVisitCount(UserDto userDto);
+
+ @PostMapping(value = "/user/query/lastVisit")
+ Result queryLastVisit(UserDto userDto);
+
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0