From 98fe87967986bf4ad01f19ca2f3c54ae067fa43c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 27 五月 2024 18:23:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-新版回访

---
 phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java                       |   28 ++++
 phis-feign/src/main/java/com/hz/his/vo/doctor/DisNumVo.java                                 |   16 ++
 phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java                  |   20 ++
 phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java             |   49 +++++++
 phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java                               |    5 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java           |    4 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java                 |   56 ++++++++
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java                         |    8 +
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java                         |   10 +
 phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java                |   53 ++++++-
 phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java |    6 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java            |   42 ++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java            |    3 
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java                                   |    2 
 phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java                                     |    6 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java                           |    4 
 phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java                   |   24 +++
 phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java             |   25 +++
 18 files changed, 349 insertions(+), 12 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
new file mode 100644
index 0000000..9a88017
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
@@ -0,0 +1,49 @@
+package com.hz.his.constant;
+
+import com.hx.util.StringUtils;
+
+/**
+ * 娲诲姩浼樻儬绫诲瀷
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+public class ActivityPreferentialConstants {
+
+    /** 浼樻儬绫诲瀷 - 闄嶄环  */
+    public static final String TYPE_PRICE_REDUCTION = "price_reduction";
+    /** 浼樻儬绫诲瀷 - 璧犻�佷紭鎯犲埜 */
+    public static final String TYPE_GIFT_COUPON = "gift_coupon";
+    /** 浼樻儬绫诲瀷 - 璧犻�佺Н鍒� */
+    public static final String TYPE_GIFT_INTEGRAL = "gift_integral";
+    /** 浼樻儬绫诲瀷 - 鎶樻墸 */
+    public static final String TYPE_DISCOUNT = "discount";
+    /** 浼樻儬绫诲瀷 - 璧犻�侀」鐩� */
+    public static final String TYPE_GIFT_PROJECT = "gift_project";
+
+
+    /** 杞崲浼樺寲绫诲瀷涓枃 */
+    public static String changeTypeCn(String type){
+        switch (type){
+            case TYPE_PRICE_REDUCTION: return "闄嶄环";
+            case TYPE_GIFT_COUPON: return "璧犻�佷紭鎯犲埜";
+            case TYPE_GIFT_INTEGRAL: return "璧犻�佺Н鍒�";
+            case TYPE_DISCOUNT: return "鎵撴姌";
+            case TYPE_GIFT_PROJECT: return "璧犻�侀」鐩�";
+            default: return "鏈煡";
+        }
+    }
+
+    /** 妫�鏌ュ垽鏂槸鍚﹁禒閫佺被鍨� */
+    public static boolean checkGiftType(String type){
+        if(StringUtils.isEmpty(type)){
+            return false;
+        }
+
+        if(TYPE_GIFT_COUPON.equals(type)
+                || TYPE_GIFT_INTEGRAL.equals(type)
+                || TYPE_GIFT_PROJECT.equals(type)){
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
new file mode 100644
index 0000000..f6e80a9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 澶嶈喘娲诲姩dto
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class RepoActivityDto {
+
+    /** 澶嶈喘娲诲姩id */
+    private String activityId;
+    /** 鐢ㄦ埛id */
+    private String userId;
+    /** 闄愬埗鐢ㄦ埛浼氬憳绛夌骇(澶氫釜閫楀彿鍒嗛殧锛岀┖鍒欎笉闄愬埗) */
+    private String limitVipLevel;
+    /** 闄愬埗闂ㄥ簵id */
+    private List<String> limitShopIdList;
+    /** 闄愬埗鍘嗗彶璐拱杩噑puId */
+    private List<String> limitSpuIdList;
+    /** 闄愬埗鍘嗗彶鍒嗙被(椤圭洰鏄犲皠琛�) */
+    private List<RepoActivityLimitDto> limitTypeList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java
new file mode 100644
index 0000000..0765a7e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 澶嶈喘娲诲姩闄愬埗dto
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class RepoActivityLimitDto {
+
+    /** 鏄犲皠妯″潡 */
+    private Integer moduleType;
+    /** 鏄犲皠鍚嶇О */
+    private String itemName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
index 799d2b1..2760d5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
@@ -17,6 +17,7 @@
 public class CouponNumberDto{
     /**鏍囪瘑*/
     private String id;
+
     /**鏍囬*/
     private String title;
     /**鏈夋晥寮�濮嬫椂闂�*/
@@ -58,6 +59,13 @@
     /**璁℃椂绫诲瀷锛�0鏃堕棿娈碉紝1棰嗗彇鏈夋晥鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級锛�2鏃犳晥鏃堕暱锛�*/
     private Integer timeType;
 
+    /** 浼樻儬鍒竔d */
+    private String couponId;
+    /** 浼樻儬鍒告爣棰� */
+    private String couponTitle;
+    /** 浼樻儬鍒哥爜id */
+    private String couponNumberId;
+
     /**璁℃椂绫诲瀷-鏃堕棿娈�*/
     public static final int TIME_TYPE_SLOT = 0;
     /**璁℃椂绫诲瀷-棰嗗彇鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
index c273def..9a31982 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -25,6 +25,8 @@
     private String signTemplateName;
     /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */
     private String templateType;
+    /** 绛剧讲浠诲姟缂栧彿 */
+    private String signTaskId;
 
     /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
     private Integer opType;
@@ -56,6 +58,10 @@
     private String positionY;
     /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
     private int positionPageNo = 1;
+    /** 绛惧悕瀹藉害 */
+    private Integer width;
+    /** 绛惧悕楂樺害 */
+    private Integer height;
 
     //鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
     /** 鍙備笌浜虹被鍨�(FddActorConstants) */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 9ed4794..79d8a0e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -24,6 +24,12 @@
     private BigDecimal totalPoints;
     /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
     private BigDecimal discount;
+    /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+    private Boolean isCanUseIntegralCash = false;
+    /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+    private BigDecimal couponTotal;
+    /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+    private BigDecimal preferentialTotal;
     /**鎶垫墸鐜伴噾閲戦*/
     private BigDecimal cash = BigDecimal.ZERO;
     /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -35,6 +41,8 @@
 
     /**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
     private String commonItemId;
+    /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+    private String commonItemGoodsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
     private String bodyPartsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
@@ -59,4 +67,6 @@
     /** 璇夋眰鍒嗙被idList */
     private List<String> appealTypeIdList;
 
+    /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
+    private List<OrderItemPreferentialDto> orderItemPreferentialList;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
new file mode 100644
index 0000000..5fabdb9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
@@ -0,0 +1,56 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟瀛愬崟鍟嗗搧鍏宠仈鐨勪紭鎯犳椿鍔�
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class OrderItemPreferentialDto {
+
+    /** 璁㈠崟id锛圤rdersTotal锛� */
+    private String orderId;
+    /** 涓�绾у瓙璁㈠崟id锛圤rderItem锛� */
+    private String orderItemId;
+
+    /** 浼樻儬娲诲姩鍚嶇О */
+    private String name;
+    /** 鏉ユ簮绫诲瀷 */
+    private String sourceType;
+    /** 鏉ユ簮鏍囪瘑 */
+    private String sourceId;
+
+    /** 杈呭姪瀛楁1 */
+    private String common1Id;
+    /** 杈呭姪瀛楁2 */
+    private String common2Id;
+    /** 杈呭姪鏁板�� */
+    private Integer commonNum;
+
+    /** 娲诲姩绫诲瀷(ActivityPreferentialConstants) */
+    private String type;
+
+    /** 浼樻儬鏁板�� */
+    private BigDecimal valNum;
+    /** 璧犻�佷紭鎯爅son */
+    private String giftJson;
+
+    /** 浼樻儬璁＄畻鎺掑簭 */
+    private Integer sortNum;
+    /** 浼樻儬鍓嶄环鏍� */
+    private BigDecimal beforePrice = BigDecimal.ZERO;
+    /** 浼樻儬鍚庝环鏍� */
+    private BigDecimal afterPrice = BigDecimal.ZERO;
+    /** 浼樻儬浠锋牸(浼樻儬鍓�-浼樻儬鍚�) */
+    private BigDecimal preferentialPrice = BigDecimal.ZERO;
+
+
+    ////////////////////////////////////////////////////////////////////////////////////////////
+
+    public OrderItemPreferentialDto() {
+    }
+}
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 196d775..97b8d87 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
@@ -1,5 +1,6 @@
 package com.hz.his.dto.order;
 
+import com.hz.his.dto.refund.RefundPreferentialDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -78,4 +79,7 @@
     //闈炲繀濉� 閲嶅彂鏍囪瘑
     private String resendRecordId;
 
+    /** 閫�娆句紭鎯� */
+    private RefundPreferentialDto refundPreferentialDto;
+
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index b17c67c..81e9e45 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -69,5 +69,7 @@
     private String giveIncreaseTitle;
     /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
     private String giveIncreaseInfo;
+    /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+    private List<String> canIntegralCashIdList;
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
new file mode 100644
index 0000000..82169a8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.refund;
+
+import com.hz.his.dto.coupon.CouponNumberDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 閫�娆句紭鎯燿to
+ * @USER: fhx
+ * @DATE: 2024/5/15
+ **/
+@Data
+public class RefundPreferentialDto {
+
+    /** 瑕侀��娆剧殑澶嶈喘娲诲姩璧犻�佺Н鍒� */
+    private BigDecimal refundRepoGiftIntegral;
+    /** 瑕侀��娆句綔搴熺殑澶嶈喘娲诲姩璧犻�佷紭鎯犲埜 */
+    private List<CouponNumberDto> refundRepoGiftCouponList;
+    /** 宸蹭娇鐢ㄤ紭鎯犲埜鎻愮ず */
+    private  List<String> couponTipsList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
index ba36af5..6d50a4d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -1,6 +1,6 @@
 package com.hz.his.dto.report.user;
 
-import com.hz.his.dto.report.UserDetailReportDto;
+import com.hz.his.dto.PageDto;
 import lombok.Data;
 
 import java.util.List;
@@ -10,17 +10,54 @@
  * @author fwq
  * */
 @Data
-public class UserDetailSelectDto extends UserDetailReportDto {
-    /**鏌ヨ娲昏穬鑰乂IP鎯呭喌 鍕鹃�変汉鏁帮細鏌ヨ�佹椿璺冿紝鍕鹃�夋祦澶憋細娴佸け 鍕鹃�夋椿璺�/娌夌潯 鏌ョ姸鎬�*/
+public class UserDetailSelectDto extends PageDto {
+    /**闂ㄥ簵鏍囪瘑*/
+    private List<String> shopIdList;
+    /**闂ㄥ簵缂栧彿*/
+    private List<String> shopNoList;
+    /**椤鹃棶鏍囪瘑*/
+    private List<String> adviserIdList;
+    /**椤鹃棶缂栧彿*/
+    private List<String> adviserNoList;
 
-    /**鏌ヨ瀹㈡埛绛夌骇*/
+    /**鏌ヨ娲昏穬鑰乂IP,娴佸け(娴佸け)/娲昏穬(鐘舵��)/娌夌潯(鐘舵��)涔嬮棿鏄�愭垨銆戝叧绯�0:娴佸け 1:娲昏穬 2:娌夌潯*/
+    private List<Integer> oldVipList;
+
+    /**鏌ヨ瀹㈡埛绛夌骇,绛夌骇涔嬮棿鏄�愭垨銆戝叧绯�*/
     private List<String> userLevelList;
-    /**涓夊ぇ椤圭洰鏈墽琛�  闆嗗悎 锛堟瘡涓兘鏄崟閫夛級*/
 
-    /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑闆嗗悎)*/
+    /**涓夊ぇ椤圭洰鏈墽琛屽ぇ鐨勬槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
+    /**鎵撳崱椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
+    private List<Integer> dkProjectList;
+    /**鎶楄“椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
+    private List<Integer> ksProjectList;
+    /**鏍稿績椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/
+    private List<Integer> hxProjectList;
 
-    /**RFM 闆嗗悎 R1..R2..绛夐兘鏄崟閫�*/
+    /**RFM涔嬮棿鏄槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
+    /**鏌ヨRFM鐨凴1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+    private List<String> rrOneList;
+    /**鏌ヨRFM鐨凢1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+    private List<String> ffOneList;
+    /**鏌ヨRFM鐨凢2,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+    private List<String> ffTwoList;
+    /**鏌ヨRFM鐨凪1,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+    private List<String> mmOneList;
+    /**鏌ヨRFM鐨凪2,鎶婄粺璁¤寖鍥村悕(渚嬪:3-6涓湀)浼犺繃鏉�*/
+    private List<String> mmTwoList;
 
-    /**瀹㈢兢:绛夌骇鍗曢�夛紝瑙﹁揪鍗曢��*/
+    /**瀹㈢兢涔嬮棿鏄�愭垨銆�,鍚勮嚜涔熸槸銆愭垨銆�*/
+    /**A瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+    private List<Integer> aaLevelList;
+    /**B瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+    private List<Integer> bbLevelList;
+    /**C瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+    private List<Integer> ccLevelList;
+    /**D瀹�,0:30澶╂棤瑙﹁揪,1:3涓湀鏃犺Е杈�,2:6涓湀鏃犺Е杈�,3:1骞存棤瑙﹁揪*/
+    private List<Integer> ddLevelList;
+
+    /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑鐢�'-'鎷兼帴鐨勯泦鍚�),涔嬮棿銆愭垨銆戠殑鍏崇郴,鍚勮嚜涔熸槸銆愪笖銆�*/
+    private List<String> planList;
+
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
new file mode 100644
index 0000000..e815426
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-doctor")
+public interface MDoctorService {
+
+    /**
+     * 鐐硅瘖鍖荤敓鎺ュ彛
+     */
+    @PostMapping(value = "/doctor/apply/diagnosis/add")
+    Result diagnosisAdd(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
new file mode 100644
index 0000000..c2f2e0e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
@@ -0,0 +1,42 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.activity.RepoActivityDto;
+import com.hz.his.dto.coupon.CouponDto;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * 澶嶈喘娲诲姩service
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "repo-activity")
+public interface SRepoActivityService {
+
+    /** 闂ㄥ簵鍒楄〃 */
+    @PostMapping(value = "/repo/activity/shop/list")
+    Result shopList();
+
+    /** SPU鍒楄〃 */
+    @PostMapping(value = "/repo/activity/spu/list")
+    Result spuList(@RequestBody PageDto dto);
+
+    /** 椤圭洰鏄犲皠鍒嗙被鍒楄〃 */
+    @PostMapping(value = "/repo/activity/project/type/relation/list")
+    Result projectTypeRelationList(@RequestBody PageDto dto);
+
+    /** 浼樻儬鍒稿垪琛� */
+    @PostMapping(value = "/repo/activity/coupon/list")
+    Result couponList(@RequestBody CouponDto couponDto);
+
+    /** 妫�鏌ユ煡璇㈢敤鎴锋槸鍚︾鍚堝弬涓庡璐椿鍔� */
+    @PostMapping(value = "/repo/activity/check/user/can/join")
+    Result checkUserCanJoin(@RequestBody RepoActivityDto repoActivityDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 970d425..3cfa716 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -186,5 +186,7 @@
     @PostMapping(value = "/order/countOrderShouldTotal")
     Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
 
-
+    /** 閫�娆惧墠閫昏緫妫�鏌� */
+    @PostMapping(value = "/order/reufnd/afrer/check")
+    Result refundAfterCheck(@RequestBody OrderRefundDto dto);
 }
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 2fe0bb2..7925679 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -4,6 +4,7 @@
 import com.hz.his.dto.report.UserDetailReportDto;
 import com.hz.his.dto.report.UserReportDto;
 import com.hz.his.dto.report.UserReportListDto;
+import com.hz.his.dto.report.user.UserDetailSelectDto;
 import com.hz.his.dto.user.UserDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -109,7 +110,7 @@
      *  rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃
      */
     @PostMapping("/admin/rfmUser/report/user/search/list")
-    Result userSearchList(@RequestBody UserDetailReportDto userDetailReportDto);
+    Result userSearchList(@RequestBody UserDetailSelectDto userDetailSelectDto);
 
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
index df278bc..98418a3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -60,4 +60,10 @@
     @PostMapping(value = "/fdd/sign/task/signTaskGetFile")
     Result signTaskGetFile(@RequestBody FddDto dto);
 
+    /** 绛剧讲浠诲姟璇︽儏 - 娉曞ぇ澶� */
+    @PostMapping(value = "/fdd/sign/task/detail/fdd")
+    Result detailFdd(@RequestBody FddDto dto);
+
+
+
 }
diff --git a/phis-feign/src/main/java/com/hz/his/vo/doctor/DisNumVo.java b/phis-feign/src/main/java/com/hz/his/vo/doctor/DisNumVo.java
new file mode 100644
index 0000000..249e094
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/doctor/DisNumVo.java
@@ -0,0 +1,16 @@
+package com.hz.his.vo.doctor;
+
+import lombok.Data;
+
+/**
+ *  鐐硅瘖瀹℃牳鏁版嵁
+ * */
+@Data
+public class DisNumVo {
+
+    /**褰撴湀鐐硅瘖閫氳繃鏁伴噺*/
+    private Integer passNum = 0;
+    /**褰撴湀鐐硅瘖涓婇檺鏁伴噺*/
+    private Integer maxNum = 0;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
index ae63cc7..835b7f5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -7,8 +7,9 @@
  */
 @Data
 public class LabelFindVo {
-
-    /**鑼冨洿鏍囪瘑*/
+    /**鑼冨洿鏍囪瘑-鏂�(鍥犱负鏃у瓧娈电殑澶勭悊鏌ヨ琚睆钄�)*/
+    private String rangeCodeNew;
+    /**鑼冨洿鏍囪瘑-鏃�*/
     private String rangeCode;
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;

--
Gitblit v1.8.0