From 863ca8e0b732166c446d5e3150b28822ff3893f7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 25 七月 2022 19:29:50 +0800
Subject: [PATCH] 修改卡项详情

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
index 1f39fd0..3f9e604 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
@@ -1,17 +1,17 @@
 package com.hz.his.feign.service;
 
 import com.hx.resultTool.Result;
-import com.hz.phis.dt.user.UserAppointmentDt;
-import com.hz.phis.dt.user.UserDt;
-import com.hz.phis.dt.user.UserLevelDt;
-import com.hz.phis.dt.user.card.UserCardDt;
-import com.hz.phis.dt.user.card.UserCardUsedDt;
-import com.hz.phis.dt.user.coupon.UserCanUseCouponDt;
-import com.hz.phis.dt.user.coupon.UserCouponDt;
-import com.hz.phis.dt.user.money.*;
-import com.hz.phis.dt.user.label.UserLabelDt;
-import com.hz.phis.dt.user.project.UserProjectDt;
-import com.hz.phis.dt.user.project.UserProjectUsedDt;
+import com.hz.his.dto.user.UserAppointmentDto;
+import com.hz.his.dto.user.UserDto;
+import com.hz.his.dto.user.UserLevelDto;
+import com.hz.his.dto.user.card.UserCardDto;
+import com.hz.his.dto.user.card.UserCardUsedDto;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.money.*;
+import com.hz.his.dto.user.label.UserLabelDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.project.UserProjectUsedDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,50 +24,64 @@
 public interface SUserService {
 
     /**
-     * 鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅
-     * @param
+     * 鏌ヨ鐢ㄦ埛鍒楄〃
      * */
-    @PostMapping(value = "/user/info/basic")
-    Result userBasicInfo(@RequestParam("userId") String userId);
+    @PostMapping(value = "/user/list")
+    Result userList(@RequestBody UserDto userDto);
 
     /**
      * 鑾峰彇鍒扮敤鎴疯鎯�
-     * @param userId 棰勭害鐢ㄦ埛鏍囪瘑
-     * @return UserDt
+     * @param userId 鐢ㄦ埛鏍囪瘑
+     * @return 杞寲浣跨敤UserDt
      */
     @PostMapping(value = "/user/info")
     Result userInfo(@RequestParam("userId") String userId);
 
     /**
+     * 鑾峰彇鐢ㄦ埛璧勯噾淇℃伅
+     * */
+    @PostMapping(value = "/user/money/info")
+    Result userMoneyInfo(@RequestParam("userId") String userId);
+
+    /**
      * 鑾峰彇鐢ㄦ埛椤圭洰
      */
     @PostMapping(value = "/user/project/list")
-    Result userProject(@RequestBody UserProjectDt userProjectDt);
+    Result userProject(@RequestBody UserProjectDto userProjectDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
      */
     @PostMapping(value = "/user/project/item/list")
-    Result userProjectItem(@RequestBody UserProjectDt userProjectDt);
+    Result userProjectItem(@RequestBody UserProjectDto userProjectDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛瀛愰」鐩娇鐢ㄨ褰�
      */
     @PostMapping(value = "/user/project/used")
-    Result userProjectUsed(@RequestBody UserProjectUsedDt userProjectUsedDt);
+    Result userProjectUsed(@RequestBody UserProjectUsedDto userProjectUsedDto);
 
 
     /**
      * 鑾峰彇鐢ㄦ埛鍗″寘
      */
     @PostMapping(value = "/user/card")
-    Result userCard(@RequestBody UserCardDt userCardDt);
+    Result userCard(@RequestBody UserCardDto userCardDto);
+
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鐨勫崱椤圭殑璇︽儏
+     * @param cardId 鍗″寘鏍囪瘑
+     * @return Result
+     */
+    @PostMapping(value = "/userCard/detail")
+    Result getUserCardDetail(@RequestParam("cardId") String cardId);
 
     /**
      * 鑾峰彇鐢ㄦ埛鍗″寘浣跨敤璁板綍
      */
     @PostMapping(value = "/user/card/used")
-    Result userCardUsed(@RequestBody UserCardUsedDt userCardUsedDt);
+    Result userCardUsed(@RequestBody UserCardUsedDto userCardUsedDto);
 
 
     /**
@@ -82,77 +96,64 @@
      * 鑾峰彇鐢ㄦ埛浼樻儬鍒�
      * */
     @PostMapping(value = "/user/coupon")
-    Result userCoupon(@RequestBody UserCouponDt userCouponDt);
+    Result userCoupon(@RequestBody UserCouponDto userCouponDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛浼樻儬鍒镐娇鐢ㄨ褰�
      * */
     @PostMapping(value = "/user/coupon/used")
-    Result userCouponUsed(@RequestParam UserCouponDt userCouponDt);
+    Result userCouponUsed(@RequestParam UserCouponDto userCouponDto);
+
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒�
+     * */
+    @PostMapping(value = "/user/can/use/coupon")
+    Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
 
 
     /**
      * 鑾峰彇鐢ㄦ埛澧炲�奸噾鍒楄〃
      * */
     @PostMapping(value = "/user/increment/list")
-    Result userIncrementList(@RequestBody UserIncrementDt userIncrementDt);
+    Result userIncrementList(@RequestBody UserIncrementDto userIncrementDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛澧炲�奸噾浣跨敤璁板綍
      * */
     @PostMapping(value = "/user/increment/used")
-    Result userIncrementUsed(@RequestBody UserIncrementDt userIncrementDt);
+    Result userIncrementUsed(@RequestBody UserIncrementDto userIncrementDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛鍌ㄥ�奸噾鍒楄〃
      * */
     @PostMapping(value = "/user/recharge/list")
-    Result userRechargeList(@RequestBody UserRechargeDt userRechargeDt);
+    Result userRechargeList(@RequestBody UserRechargeDto userRechargeDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛璧勯噾浣跨敤璁板綍
      * */
     @PostMapping(value = "/user/money/used")
-    Result userConsumeDt(@RequestBody UserConsumeDt userConsumeDt);
+    Result userConsumeDt(@RequestBody UserConsumeDto userConsumeDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛绉垎鍒楄〃
      * */
     @PostMapping(value = "/user/integral/list")
-    Result userIntegralList(@RequestBody UserIntegralDt userIntegralDt);
+    Result userIntegralList(@RequestBody UserIntegralDto userIntegralDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛绉垎浣跨敤璁板綍
      * */
     @PostMapping(value = "/user/integral/used")
-    Result userIntegralUsed(@RequestBody UserIntegralDt userIntegralDt);
+    Result userIntegralUsed(@RequestBody UserIntegralDto userIntegralDto);
 
-    /**
-     * 鏍规嵁鐢佃瘽鍙风爜鏌ヨ鐢ㄦ埛淇℃伅
-     * @param tel
-     * */
-    @PostMapping(value = "/user/info/tel")
-    Result findUserInfoByTel(@RequestParam("tel") String tel);
 
     /**
      * 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
-     * @param
      * */
     @PostMapping(value = "/user/have/count")
     Result userHaveCount(@RequestParam("userId") String userId);
-
-    /**
-     * 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒�
-     * @param
-     * */
-    @PostMapping(value = "/user/can/use/coupon")
-    Result userCanUseCoupon(@RequestBody UserCanUseCouponDt userCanUseCouponDt);
-
-    /**
-     * 鏍规嵁鐢佃瘽鍙风爜鎴栬�匔IQ鑾峰彇鎸囧畾鐢ㄦ埛
-     * */
-    @PostMapping(value = "/user/info/telOrCiq")
-    Result findUserByTelOrCiq(@RequestBody UserDt userDt);
 
 
     /**
@@ -160,39 +161,38 @@
      * @param
      * */
     @PostMapping(value = "/user/label")
-    Result userLabel(@RequestBody UserLabelDt userLabelDt);
+    Result userLabel(@RequestBody UserLabelDto userLabelDto);
 
 
     /**
      * 鑾峰彇鐢ㄦ埛娑堣垂鏁版嵁
-     * @param
      * */
     @PostMapping(value = "/user/consume/count")
-    Result userConsumeCount(@RequestBody UserConsumeDt userConsumeDt);
+    Result userConsumeCount(@RequestBody UserConsumeDto userConsumeDto);
 
 
     /**
      * 鑾峰彇鐢ㄦ埛棰勭害鏁版嵁
      * */
     @PostMapping(value = "/user/appointment/list")
-    Result userAppointment(@RequestBody UserAppointmentDt userAppointmentDt);
+    Result userAppointment(@RequestBody UserAppointmentDto userAppointmentDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛鍒掓墸璁板綍
      * */
     @PostMapping(value = "/user/project/deduction/list")
-    Result userProjectDeduction(@RequestBody UserProjectDt userProjectDt);
+    Result userProjectDeduction(@RequestBody UserProjectDto userProjectDto);
 
     /**
      * 鑾峰彇浼氬憳绛夌骇鍙樺寲璁板綍
      * */
     @PostMapping(value = "/user/level/record/list")
-    Result userLevelRecord(@RequestBody UserLevelDt userLevelDt);
+    Result userLevelRecord(@RequestBody UserLevelDto userLevelDto);
 
     /**
      * 鑾峰彇鐢ㄦ埛寰呴鍙栧鍊奸噾鍒楄〃
      * */
     @PostMapping(value = "/user/wait/increment/list")
-    Result userWaitIncList(@RequestBody UserWaitIncDt userWaitIncDt);
+    Result userWaitIncList(@RequestBody UserWaitIncDto userWaitIncDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0