From 6bf4c2860162d70182b8d5c239263b0fa48b20a2 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 07 十二月 2022 16:17:22 +0800
Subject: [PATCH] 新增,修改,删除领建商品分类到领建,新增,修改商品到领建

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   68 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 10 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 39b0dd2..f638802 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,18 +1,19 @@
 package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
-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.*;
 import com.hz.his.dto.user.card.UserCardDto;
 import com.hz.his.dto.user.card.UserCardUsedDto;
+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.money.*;
 import com.hz.his.dto.user.label.UserLabelDto;
-import com.hz.his.dto.user.project.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;
+import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +30,12 @@
      * */
     @PostMapping(value = "/user/list")
     Result userList(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃
+     * */
+    @PostMapping(value = "/user/list/ids")
+    Result userIdList(@RequestBody UserDto userDto);
 
     /**
      * 鑾峰彇鍒扮敤鎴疯鎯�
@@ -87,10 +94,9 @@
 
     /**
      * 鑾峰彇鐢ㄦ埛淇冮攢浣跨敤璁板綍
-     * @param orderItemNo 瀛愯鍗曞彿
      * */
     @PostMapping(value = "/user/promotion/used")
-    Result userPromotionUsed(@RequestParam("orderItemNo") String orderItemNo);
+    Result userPromotionUsed(@RequestBody UserPromotionUsedDto userPromotionUsedDto);
 
 
     /**
@@ -111,6 +117,19 @@
      * */
     @PostMapping(value = "/user/can/use/coupon")
     Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
+
+    /**
+     * 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
+     * */
+    @PostMapping(value = "/goods/can/use/coupon")
+    Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto);
+
+    /**
+     * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
+     * 杞寲浣跨敤 CouponNumberDto
+     */
+    @PostMapping(value = "/order/can/use/coupon")
+    Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);
 
 
     /**
@@ -152,9 +171,10 @@
 
     /**
      * 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
+     * 杩斿洖浣跨敤UserHaveDt
      * */
     @PostMapping(value = "/user/have/count")
-    Result userHaveCount(@RequestParam("userId") String userId);
+    Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
 
 
     /**
@@ -209,9 +229,37 @@
     Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
 
     /**
-     * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+     * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
      * */
     @PostMapping(value = "/user/package/list")
-    Result userPackageList(@RequestBody UserPackageDto userPackageDto);
+    Result userPackageList(@RequestBody UserPhisPackageDto userPhisPackageDto);
+
+    /**鏍规嵁鏍囪瘑闆嗗悎绛涢�夌敤鎴�*/
+    @PostMapping(value = "/user/idList/list")
+    Result userIdSelectList(@RequestBody UserIdsDto userIdsDto);
+
+    /**鑾峰彇鐢ㄦ埛淇℃伅锛岀煭淇℃ā鏉夸笓鐢�
+     * 鑾峰彇鏍规嵁id鎴栬�匔IQ鎴栬�卙isId鏌ユ壘鐢ㄦ埛
+     * @param userDto 鍙娇鐢╥d鍜孋IQ
+     * @return 杞寲浣跨敤UserDt
+     */
+    @PostMapping(value = "/user/sms-find")
+    Result userSms(@RequestBody UserDto userDto);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+     * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+     * @param userDto 鍙娇鐢╪ame鍜孋IQ
+     * @return 杞寲浣跨敤UserDt
+     */
+    @PostMapping(value = "/user/crowd/import")
+    Result userCrowdImport(@RequestBody UserDto userDto);
+
+
+    /**
+     * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
+     */
+    @PostMapping(value = "/user/project/items")
+    Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0