From 99ffdf25456cd2d9bb90d275d00257cdd8cfc879 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 13 十一月 2023 10:08:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-订单积分
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java | 6 +++---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 6 ++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 2e30c02..b00b365 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -51,6 +51,12 @@
/** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
private Integer isMarketApply = 0;
+ /**鏄惁鏌ヨ鍏宠仈淇℃伅*/
+ private Integer isSelectGoods = 1;
+ /**鏌ヨ鐢熸棩鍒�*/
+ private Integer isSelectBirthday;
+ /**浼樻儬鍒哥被鍨�*/
+ private String couponType;
/** 浼樻儬鍒稿垎绫籌D*/
private String couponTypeId;
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
index bde5a2c..4e389ce 100644
--- 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
@@ -34,13 +34,13 @@
Result check(@RequestBody UserDto userDto);
@PostMapping(value = "/user/query/visitCount")
- Result queryVisitCount(UserDto userDto);
+ Result queryVisitCount(@RequestBody UserDto userDto);
@PostMapping(value = "/user/query/lastVisit")
- Result queryLastVisit(UserDto userDto);
+ Result queryLastVisit(@RequestBody UserDto userDto);
@PostMapping(value = "/user/query/appointment/list")
- Result queryAppointmentList(UserDto userDto);
+ Result queryAppointmentList(@RequestBody UserDto userDto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
index ef698c9..4e155ef 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -36,4 +36,10 @@
*/
@PostMapping(value = "/employee/sent/email/notice")
Result senEmailNotice(@RequestBody EmployeeDto employeeDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇浼佷笟寰俊鐢ㄦ埛淇℃伅
+ */
+ @PostMapping(value = "/employee/corp/info")
+ Result corpInfo(@RequestBody EmployeeDto employeeDto);
}
\ No newline at end of file
--
Gitblit v1.8.0