From 3ea49203f323e2fe2471488425bab1884d680c21 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 24 二月 2023 11:18:59 +0800
Subject: [PATCH] 创建订单-促销金额计算优化-折扣问题

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 bdbba21..fa0720e 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
@@ -1,14 +1,15 @@
 package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.coupon.CouponDto;
 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.*;
-import com.hz.his.dto.user.money.*;
+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.packages.UserPackageDto;
+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;
@@ -170,7 +171,7 @@
 
     /**
      * 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
-     * 杩斿洖浣跨敤Dt
+     * 杩斿洖浣跨敤UserHaveDt
      * */
     @PostMapping(value = "/user/have/count")
     Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
@@ -254,4 +255,18 @@
     @PostMapping(value = "/user/crowd/import")
     Result userCrowdImport(@RequestBody UserDto userDto);
 
+
+    /**
+     * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
+     */
+    @PostMapping(value = "/user/project/items")
+    Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);
+
+    /**
+     * 鑾峰彇鍒扮敤鎴疯鎯�(鍚屾浣跨敤)
+     * @param userId 鐢ㄦ埛鏍囪瘑
+     * @return 杞寲浣跨敤UserDt
+     */
+    @PostMapping(value = "/user/info/baseInfo")
+    Result userInfoBaseInfo(@RequestParam("userId") String userId);
 }
\ No newline at end of file

--
Gitblit v1.8.0