From c800715e798d45e50aa6b8e6930a7a680526177d Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 10 八月 2022 14:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 50 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java | 5 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java | 6 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java | 24 ++++++++
phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 18 ++++++
10 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
index bda847d..ce3d55d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
@@ -12,5 +12,10 @@
public class ActivityDto extends PageDto {
/**闂ㄥ簵鏍囪瘑 */
private String shopId;
+ /**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */
+ private String typeId;
+ /**鍥㈣喘娲诲姩鏍囪瘑 */
+ private String groupBuyId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 5b50ee8..4c4603a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -18,12 +18,14 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**娲诲姩鏍囪瘑*/
+ private String groupBuyId;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
private List<UserArrDto> userArr;
-
+ private List<CouponItemDto> itemDtoList;
/**淇敼鏃堕棿*/
private String updateTime;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
index a05323d..ac67919 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
@@ -10,12 +10,14 @@
* 鍟嗗搧浼樻儬鍒告墿灞�
* */
@Data
-public class CouponGoodsDto {
+public class CouponGoodsDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
/**鏍囪瘑*/
private String commonId;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
/**鎬婚噾棰�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
new file mode 100644
index 0000000..e18ddd8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鍙戦�佷紭鎯犲埜dto
+ */
+@Data
+public class CouponItemDto {
+
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+
+ /**鏍囪瘑鐖舵爣璇嗗瓧绗︿覆閫楀彿鍒嗛殧*/
+ private Integer num;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
index d611a7f..d639dbd 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
@@ -15,4 +15,6 @@
private String shopId;
/**瀛楀吀璧勮川缂栫爜*/
private String qualificationNo;
+ /**鏄惁涓婃灦灞曠ず*/
+ private Integer isUp;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
index 1a97941..8f2fb3b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
@@ -12,12 +12,14 @@
@Data
public class UserPackageDto extends PageDto {
- /**鏍囩鏍囪瘑闆嗗悎*/
- private List<String> labelIdList;
+ /**鏍囩鍚嶇О闆嗗悎*/
+ private List<String> labelNameList;
/**椤圭洰鏍囪瘑闆嗗悎*/
private List<String> projectIdList;
/**浼氬憳绛夌骇鍚嶇О闆嗗悎*/
private List<String> memberLevelList;
+ /**id闆嗗悎*/
+ private List<String> idList;
/**鐢ㄦ埛鍒涘缓鏃堕棿寮�濮�*/
private String createStartTime;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
new file mode 100644
index 0000000..2bca4c3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
@@ -0,0 +1,50 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
+public interface SActivityService {
+
+ /**
+ * 娲诲姩瑙勫垯璇︽儏
+ * @param id 娲诲姩鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/activity/detail")
+ Result getActivityDetail(@RequestParam("id") String id);
+
+
+ /**
+ * 娲诲姩瑙勫垯鍒楄〃
+ * @param shoId 闂ㄥ簵鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/activity/shopId/list")
+ Result getActivityList(@RequestParam("shoId") String shoId);
+
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁绗﹀悎娲诲姩瑙勫垯
+ * @param userId 鐢ㄦ埛鏍囪瘑
+ * @param id 娲诲姩鏍囪瘑
+ * @param ordersTotal 璁㈠崟鎬婚噾棰�
+ * @return Result
+ */
+ @PostMapping(value = "/activity/list")
+ Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 9673a12..f0567c2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -50,4 +50,12 @@
@PostMapping(value = "/goods/canUsed/coupon")
Result goodsCanUsedCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
+
+ /**
+ * 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
+ */
+ @PostMapping(value = "/check/group/coupon")
+ Result checkGroupCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
+
+
}
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 e3f5d45..f9a5f91 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
@@ -223,7 +223,7 @@
Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
/**
- * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,鎷ユ湁鐨勬爣绛�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
+ * 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
* */
@PostMapping(value = "/user/package/list")
Result userPackageList(@RequestBody UserPackageDto userPackageDto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java
new file mode 100644
index 0000000..6eecb79
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-meituan")
+public interface SPhipMeiTuanOrderService {
+
+ /**
+ * 缇庡洟璁㈠崟鎺ㄩ�乧rm楠岃瘉
+ * @param jsonObject
+ * orderId 缇庡洟璁㈠崟id
+ * phone 鎵嬫満鍙�
+ * @return
+ */
+ @PostMapping(value = "/meituan/order/sendCrm")
+ Result sendCrm(@RequestBody JSONObject jsonObject);
+}
--
Gitblit v1.8.0