From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 8 +++++++-
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 4 ++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 4dd2935..325f280 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,5 +1,7 @@
package com.hz.his.dto.user;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -35,4 +37,6 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
+ /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
+ private String appId;
}
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..34dc498 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,14 @@
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);
}
\ No newline at end of file
--
Gitblit v1.8.0