From d07e5cacbf0f3c1e1b5b42e115e1de574de55aea Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 12 七月 2023 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 1a14dcb..ab4bd11 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -285,8 +285,38 @@
     Result nextLevel(@RequestBody UserDto userDto);
 
     /**
-     * 鏌ヨ鐢ㄦ埛浼氬憳绛夌骇涓嬩竴绾�
+     * 鏌ヨ绱杩斾剑
      * */
     @PostMapping(value = "/user/query/rebate")
     Result queryRebate(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+     * */
+    @PostMapping(value = "/user/first/day/consumption")
+    Result firstDayConsumption(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+     * */
+    @PostMapping(value = "/user/accumulat/consumption")
+    Result accumulateConsumption(@RequestBody UserDto userDto);
+
+    /**
+     * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+     * */
+    @PostMapping(value = "/user/check/upgraded/aesthetics")
+    Result checkUpgradedAesthetics(@RequestBody UserDto userDto);
+
+    /**
+     * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+     * */
+    @PostMapping(value = "/user/check/consumption")
+    Result checkConsumption(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绱杩斾剑
+     * */
+    @PostMapping(value = "/user/rebate/userId")
+    Result queryRebateByUserId(@RequestBody UserDto userDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0