From ef212c321c6d833d69091e7491521f7d11984bfb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 十月 2023 15:46:06 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java | 21 +++
phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 18 ++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java | 29 ++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java | 47 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 6
phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java | 51 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java | 21 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java | 12 +
phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java | 13 +
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 3
phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java | 14 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java | 24 +++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 3
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java | 12 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 54 ++++++-
phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java | 20 ++
phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java | 3
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2
30 files changed, 372 insertions(+), 20 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
index 26cf3d1..b5f509f 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
@@ -9,6 +9,5 @@
**/
@Data
public class DConsumablesDto extends DCommonDto {
-
-
+ private Integer type;
}
diff --git a/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
index 53985c7..411abf6 100644
--- a/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
+++ b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
@@ -15,9 +15,11 @@
public interface DFileDownloadService {
/**瀵煎嚭绫诲瀷-搴曡〃-棰勭害鏁版嵁*/
-
+ @PostMapping(value = "/report/export/app/list")
+ Result exportAppointmentList(@RequestBody DAppointDto dAppointDto);
/**瀵煎嚭绫诲瀷-搴曡〃-鍖荤敓鎺掔彮*/
-
+ @PostMapping(value = "/report/export/doctor/time/monthData")
+ Result exportDoctorTime(@RequestBody DDoctorTimeDto dDoctorTimeDto);
/**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒�*/
@PostMapping(value = "/report/export/coupon/list")
Result exportCoupon(@RequestBody DCouponDto dCouponDto);
diff --git a/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java b/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java
new file mode 100644
index 0000000..50014c2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.base;
+
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/10/11
+ **/
+@Data
+public class CodeNoDataDto {
+
+ /** 缂栧彿 */
+ private String codeNo;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
index 031d046..c0bf96e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
@@ -11,4 +11,6 @@
public class ConsumablesDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
+ /** 璐拱鏁伴噺 */
+ private Integer buyNum;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
index c3cba43..00f9493 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -54,6 +54,8 @@
private String marketActivityId;
/** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
private String activityCouponId;
+ /** 钀ラ攢娲诲姩鍒嗙粍id */
+ private String groupId;
/** 骞冲彴绫诲瀷(PlatformConstants) */
private String platformType;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
index 190dc23..58569fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -42,6 +42,8 @@
/**鏄惁鏌ヨ绉垎璁㈠崟*/
private Integer isIntegral;
- //鏄惁鏌ヨ宸插畬鎴愯鍗�
+ /**鏄惁鏌ヨ宸插畬鎴愯鍗�*/
private Integer isSuc;
+ /**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
+ private Integer isGroupBuy;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index d956e15..8297196 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -46,6 +46,8 @@
private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
+ /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundIntegral;
/** 鍙��娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> payMethodList;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index bee390c..c789dff 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -101,4 +101,6 @@
private String treatSingleId;
/** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
private String addWay;
+ /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+ private Integer isGroupBuy;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index a7127cf..940b97c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -22,6 +22,10 @@
private List<String> employeeIdList;
/**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**鐢ㄦ埛鐘舵��*/
+ List<String> userStatusList;
+ /**鏄惁鏌ヨVIP鐢ㄦ埛*/
+ Integer selectVip;
/**褰撳墠鏃堕棿*/
private String nowTime;
/**寮�濮嬫椂闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java
new file mode 100644
index 0000000..7bfb1c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.report;
+import java.util.List;
+
+/***
+ * 闂ㄥ簵-鍜ㄨ甯� 鎸囨爣鏁版嵁 dto
+ */
+public class ShopIndicatorsDto {
+
+ //鍙傛暟
+ private List<String> shopIdList;
+ private List<String> timeList;
+
+ public List<String> getShopIdList() {
+ return shopIdList;
+ }
+
+ public void setShopIdList(List<String> shopIdList) {
+ this.shopIdList = shopIdList;
+ }
+
+ public List<String> getTimeList() {
+ return timeList;
+ }
+
+ public void setTimeList(List<String> timeList) {
+ this.timeList = timeList;
+ }
+
+}
\ No newline at end of file
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 6d7ad5e..fa7b371 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
@@ -43,5 +43,7 @@
private Date startTime;
/**缁撴潫鏃堕棿*/
private Date endTime;
+ //鏄惁璇勪环
+ private Integer isEvaluate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index eae2439..87a3ce0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -166,6 +166,9 @@
private String mainAppeal;
private String minorAppeal;
+ /**鏄惁澶勭悊鍙槸*/
+ private Integer isEditFamiliesRoom = 0;
+
public UserParamDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
index fb04d0d..03ab138 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
@@ -16,7 +16,7 @@
private String fromCode;
/**
- * 鏉ユ簮鍚嶇О
+ * 鏉ユ簮鍚嶇О/鏉ユ簮璺緞
*/
private String fromName;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
index 5dd73ae..f4f6bd2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
@@ -27,4 +27,7 @@
private String recordId;
/**鎿嶄綔绫诲瀷*/
private Integer opType;
+
+ //鏄惁杩囨护棰嗗缓鏁版嵁
+ private Integer isFilterate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
index 04617ed..c2a06e9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
@@ -27,4 +27,6 @@
private String recordId;
/**鎿嶄綔绫诲瀷*/
private Integer opType;
+ //鏄惁杩囨护棰嗗缓鏁版嵁
+ private Integer isFilterate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java
new file mode 100644
index 0000000..dc6ed73
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java
@@ -0,0 +1,51 @@
+package com.hz.his.dto.warehouse;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 绉诲簱鍗曞弬鏁�
+ */
+@Data
+public class PhiStockMoveDto {
+
+ /**鏉ユ簮绫诲瀷:0涓烘不鐤楅�氱煡鍗曢鑽�*/
+ private Integer commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String commonId;
+ /**鏉ユ簮缂栧彿*/
+ private String commonNo;
+
+ /**鍏宠仈绉诲簱鍗曟爣璇�*/
+ private String moveId;
+ /**鍏宠仈绉诲簱鍗曞崟鍙�*/
+ private String moveNo;
+
+ /**鎿嶄綔浜虹被鍨�(鍏蜂綋鐪嬪涓嬪父閲�)-蹇呭～*/
+ private Integer opType;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String opId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String opName;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜哄娉�*/
+ private String opRemark;
+
+ /**绉诲簱鍟嗗搧-蹇呭～*/
+ List<PhiStockMoveItemDto> itemDtoList;
+
+
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OP_TYPE_SYS = 0;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OP_TYPE_EMPLOYEE = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer OP_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OP_TYPE_ADMIN = 3;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java
new file mode 100644
index 0000000..c181c40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto.warehouse;
+
+import lombok.Data;
+
+/**
+ * 绉诲簱鍗曞瓙椤�
+ */
+@Data
+public class PhiStockMoveItemDto {
+ /************************蹇呭～******************************/
+ /**绉诲姩搴撳瓨鏍囪瘑*/
+ private String sourceItemId;
+
+ /**绉诲姩鏁伴噺*/
+ private Integer num;
+
+ /**鐩爣浠撳簱鏍囪瘑*/
+ private String targetWarehouseId;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java
new file mode 100644
index 0000000..ae63433
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.base.CodeNoDataDto;
+import com.hz.his.dto.card.CardDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "code-no-data")
+public interface SCodeNoDataService {
+
+ /**
+ * 鏌ヨ缂栧彿鍏宠仈鏁版嵁
+ * @return Result
+ */
+ @PostMapping(value = "/code/no/data/detail")
+ Result getDetail(@RequestBody CodeNoDataDto codeNoDataDto);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index 57fef07..b1ed46a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -42,4 +42,8 @@
*/
@PostMapping(value = "/consumables/coupon/list")
Result getConsumablesCouponList(@RequestBody PageDto pageDto);
+
+ /** 妫�鏌ヤ紭鎯犲埜鍟嗗搧鏄惁鍙喘涔� */
+ @PostMapping(value = "/check/consumables/coupon/isBuy")
+ Result checkConsumablesCouponIsBuy(@RequestBody ConsumablesDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
index 345aff0..b815fe0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -11,8 +11,8 @@
import java.math.BigDecimal;
/**
- * @ClassName SActivityController
- * @Description 娲诲姩瑙勫垯
+ * @ClassName SQuestionnaireService
+ * @Description 璋冩煡闂嵎鎺ㄩ�佽褰�
* @Author Wrh
* @Date 2022/8/8 17:36
* @Version 1.0
@@ -29,5 +29,14 @@
Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto);
+ /**
+ * 鑾峰彇璋冩煡闂嵎鎺ㄩ�佽褰曞垪琛�
+ * @param dto 鐢ㄦ埛鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/sending/records/list")
+ Result getSendingRecordsList(@RequestBody(required = false) UserDto dto);
+
+
}
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 77ac4ed..5c118f0 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
@@ -344,4 +344,10 @@
@PostMapping(value = "/user/draw/list")
Result drawGetUserDt(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绉戝鍏崇郴
+ * */
+ @PostMapping(value = "/user/room/list")
+ Result userRoomList(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java
new file mode 100644
index 0000000..bde5a2c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserVisitService.java
@@ -0,0 +1,47 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+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.label.UserLabelDto;
+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;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-visit")
+public interface SUserVisitService {
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏄惁鏈夊埌璁�
+ * */
+ @PostMapping(value = "/user/check")
+ Result check(@RequestBody UserDto userDto);
+
+ @PostMapping(value = "/user/query/visitCount")
+ Result queryVisitCount(UserDto userDto);
+
+ @PostMapping(value = "/user/query/lastVisit")
+ Result queryLastVisit(UserDto userDto);
+
+ @PostMapping(value = "/user/query/appointment/list")
+ Result queryAppointmentList(UserDto userDto);
+
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
index 143e947..bd0b606 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmployeeDto;
import com.hz.his.dto.employee.EmployeeRoleDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -18,4 +19,15 @@
@PostMapping(value = "/employee/role/list")
Result getEmployeeRoleList(@RequestBody EmployeeRoleDto employeeRoleDto);
+ /**
+ * 寮�鏀惧钩鍙�-鐢熸垚鍛樺伐鑾峰閾炬帴
+ */
+ @PostMapping(value = "/employee/create/acquisition/link")
+ Result createAcquisitionLink(@RequestBody EmployeeDto employeeDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鏌ヨ鍛樺伐鑾峰閾炬帴(閭ｄ簺浼佷笟鐢ㄦ埛娣诲姞浜�)
+ */
+ @PostMapping(value = "/employee/search/acquisition/link")
+ Result searchAcquisitionLink(@RequestBody EmployeeDto employeeDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
index 809ec04..5066ee7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -18,10 +18,22 @@
@PostMapping(value = "/market/activity/list")
Result list(@RequestBody MarketActivityDto dto);
+ /** 鍒嗙被tab鍒楄〃 */
+ @PostMapping(value = "/market/activity/tabData")
+ Result tabData(@RequestBody MarketActivityDto dto);
+
+ /** 椤堕儴杞挱鍥炬暟鎹� */
+ @PostMapping(value = "/market/activity/topBannerData")
+ Result topBannerData(@RequestBody MarketActivityDto dto);
+
/** 璇︽儏 */
@PostMapping(value = "/market/activity/detail")
Result detail(@RequestBody MarketActivityDto dto);
+ /** 纭鏌ョ湅 */
+ @PostMapping(value = "/market/activity/confirmView")
+ Result confirmView(@RequestBody MarketActivityDto dto);
+
/** 棰嗗彇浼樻儬鍒� */
@PostMapping(value = "/market/activity/receiveCoupon")
Result receiveCoupon(@RequestBody MarketActivityDto dto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 70b272f..ad56d0c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -108,4 +108,22 @@
*/
@PostMapping(value = "/user/gzh/info")
Result userGZHInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇crm灏忕▼搴忚烦杞摼鎺�
+ */
+ @PostMapping(value = "/user/crm/url/link")
+ Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍙戦�佽幏瀹㈡秷鎭坊鍔犲鎴�
+ */
+ @PostMapping(value = "/user/acquisition/sent")
+ Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鑾峰鏁版嵁璁板綍
+ */
+ @PostMapping(value = "/user/acquisition/list")
+ Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java
new file mode 100644
index 0000000..dd7eb3a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.warehouse.PhiStockMoveDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-warehouse")
+public interface SPhipWareHouseService {
+
+ /**
+ * 寮�鏀惧钩鍙拌浆鍙戝埌浠撳簱锛岀敓鎴愮Щ搴撳崟
+ */
+ @PostMapping(value = "/warehouse/order/create/move/stock")
+ Result moveStockOrder(@RequestBody PhiStockMoveDto phiStockMoveDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index c484ce3..a1f2a13 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -120,5 +120,8 @@
@PostMapping("/admin/consultant/report/first/user/rate/export")
Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-寰俊鑱婂ぉ鎬绘暟鍙婄兢鑱婃暟閲�*/
+ @PostMapping("/admin/consultant/report/consultant/chat/data")
+ Result consultantWeChatData(@RequestBody EmployeeReportDto employeeReportDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index cb348d7..9cbdffb 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -52,7 +52,49 @@
@PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 娌荤枟鏍囩浼氬憳鏁伴噺
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+ Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 浼氬憳娌荤枟鎯呭喌鎬昏〃
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/detail/list")
+ Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/project/items/list")
+ Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍒嗙被娌荤枟娓楅�忔儏鍐�
+ */
+ @PostMapping("/admin/doctor/sale/report/type/permeate/list")
+ Result typePermeateList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎵ц椤圭洰-鑱斿悎澶氶」鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/project/therapy/multiple")
+ Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 瀹㈡埛棰勭害鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/appoint/list")
+ Result appointList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+
+
+ /*******************************涓嬮潰鎺ュ彛2.0搴熷純*********************************/
/**
* 鎵ц閮ㄤ綅
*/
@@ -76,18 +118,6 @@
*/
@PostMapping("/admin/doctor/sale/report/loss/project/market/list")
Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);
-
- /**
- * 娌荤枟鏍囩浼氬憳鏁伴噺
- */
- @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
- Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
-
-
-
-
-
-
/**
* 鎵ц椤圭洰-SPU鍗犳瘮
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index 153efc7..0b9fc19 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -167,4 +167,10 @@
@PostMapping("/admin/operational/channels/deal/dw/spa")
Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * SPA浠ｇ帇涓氱哗鎶ヨ〃-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/channels/deal/dw/spa/export")
+ Result channelsSpaDwExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java
new file mode 100644
index 0000000..a9d461c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ShopIndicatorsDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 鍜ㄨ甯堣瘎鍒嗘姤琛�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-shop-indicators")
+public interface BiShopIndicatorsService {
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃 */
+ @PostMapping("/admin/shop/indicators/list")
+ Result shopEmpDeductionList(@RequestBody(required = false) ShopIndicatorsDto shopIndicatorsDto);
+
+}
\ No newline at end of file
--
Gitblit v1.8.0