From cb70a5110bc73fb6ce025ab4265e7f00d4694ab5 Mon Sep 17 00:00:00 2001
From: wzh <zhuhaow@phiskin.com>
Date: 星期五, 29 七月 2022 14:51:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java          |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPromotionService.java  |   28 +
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java                    |   19 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java       |   53 +
 phis-feign/src/main/java/com/hz/his/dto/card/CardQueryDto.java                         |   22 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java      |   46 +
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java                        |   84 +++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java        |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java              |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java          |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java               |   14 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCardItemService.java   |   29 +
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java           |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java            |    2 
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java                   |  183 ++++++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SDictionariesService.java       |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java               |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java               |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java           |    2 
 phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionQueryDto.java               |   22 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java       |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderUseProjectService.java    |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java             |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsumableService.java |   37 +
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java    |   36 +
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java                      |  168 ++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java      |   49 +
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java                         |  252 +++++++++
 phis-feign/src/main/java/com/hz/his/dto/project/ProjectQueryDto.java                   |   22 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SGzhService.java                |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java      |   28 +
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java                 |   88 ++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java           |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java        |    2 
 /dev/null                                                                              |   43 -
 phis-feign/src/main/java/com/hz/his/dto/consumables/GoodsQueryDto.java                 |   22 
 phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java                         |   36 +
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java     |   35 +
 phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java                         |   48 +
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SSectionRoomService.java        |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLevelService.java          |   10 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java                  |   23 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java                   |   26 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java              |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java              |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java        |   54 ++
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java                          |   19 
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java                      |   27 +
 48 files changed, 1,477 insertions(+), 84 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardQueryDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardQueryDto.java
new file mode 100644
index 0000000..3274f86
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardQueryDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.card;
+
+
+import com.hz.his.dto.PageDto;
+
+/**
+ * 鍗¢」鏌ヨ鍙傛暟
+ * @author fwq
+ */
+public class CardQueryDto extends PageDto {
+
+    /**鍗¢」鏍囪瘑*/
+    private String cardId;
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consumables/GoodsQueryDto.java b/phis-feign/src/main/java/com/hz/his/dto/consumables/GoodsQueryDto.java
new file mode 100644
index 0000000..bd85b2a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consumables/GoodsQueryDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.consumables;
+
+
+import com.hz.his.dto.PageDto;
+
+/**
+ * 鍟嗗搧鏌ヨ鍙傛暟
+ * @author fwq
+ */
+public class GoodsQueryDto extends PageDto {
+
+    /**鍟嗗搧鏍囪瘑*/
+    private String goodsId;
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+}
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 38bf6c7..a044af2 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
@@ -1,14 +1,29 @@
 package com.hz.his.dto.coupon;
 
+
+
 import com.hz.his.dto.PageDto;
 import lombok.Data;
+import java.util.List;
 
 /**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
  * @author fwq
- * 浼樻儬鍒告墿灞�
- * */
+ */
 @Data
 public class CouponDto extends PageDto {
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+    /**鍙戦�佽褰�*/
+    private CouponRecordDto couponReleaseRecordItem;
+    /**鐢ㄦ埛璇︽儏*/
+    private List<UserArrDto> userArr;
+
+    /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+    private String appIdCode;
+
     /**淇敼鏃堕棿*/
     private String updateTime;
 
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
new file mode 100644
index 0000000..55537bf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.coupon;
+
+
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒�
+ *
+ * @author fwq
+ */
+@Data
+public class CouponRecordDto {
+    /**浼樻儬鍒告爣璇�*/
+    private String couponId;
+    /**鎵规鍙峰悕绉�*/
+    private String recordName;
+    /**鍏叡鏍囪瘑*/
+    private String commonId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
new file mode 100644
index 0000000..dfb62c1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/UserArrDto.java
@@ -0,0 +1,36 @@
+package com.hz.his.dto.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @ClassName UserArrDto
+ * @Description 鍙戦�佷紭鎯犲埜鐢ㄦ埛鏁扮粍dto
+ * @Author Wrh
+ * @Date 2022/7/15 18:40
+ * @Version 1.0
+ */
+@Data
+public class UserArrDto extends PageDto {
+
+    /**鐢ㄦ埛鍥剧墖*/
+    private String imgUrl;
+    /**鐢ㄦ埛鎬у埆1鐢�2濂�0鏈煡*/
+    private Integer gender;
+    /**鍒涘缓鏃堕棿*/
+    private String createTime;
+    /**鐢ㄦ埛鍚嶇О*/
+    private String name;
+    /**鐢ㄦ埛鎵嬫満鍙�*/
+    private String tel;
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String id;
+    /**鐢ㄦ埛hisId*/
+    private String apiId;
+    /**鏄惁鍙戦�佺煭淇� 1鏄�0鍚�*/
+    private Integer isSendSMS;
+    /**鏁伴噺鍙戦�佷紭鎯犲埜鏁伴噺*/
+    private Integer amount;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
new file mode 100644
index 0000000..5b505d7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
@@ -0,0 +1,84 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟淇℃伅
+ * @author wzh
+ */
+@Data
+public class OrderItemDto {
+
+    /** id */
+    private String id;
+
+    /** 璁㈠崟缂栧彿锛屼互SO锛夊紑澶�, SOyyyyMMdd0000000 */
+    private String orderNo;
+    /** 鍟嗗搧绫诲瀷(OrderItemConstants) */
+    private String type;
+
+    /** 椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜 */
+    private String goodsNo;
+    /** 椤圭洰鍚嶇О/鍟嗗搧鍚嶇О */
+    private String goodsName;
+    /** 椤圭洰涓诲浘/鍟嗗搧鍥剧墖 */
+    private String goodsImage;
+    /** 瑙勬牸锛屽啑浣欏瓧娈碉紙鏍煎紡锛歔{'specsId':鈥樿鏍兼爣璇嗏��,'specsTitle':'瑙勬牸鍚嶇О,'specsValue':'瑙勬牸鍊�','unit':'鍗曚綅'}]锛� */
+    private String specs = "[]";
+    /** 韬綋閮ㄤ綅鏍囪瘑 */
+    private String bodyPartsId;
+    /** 韬綋閮ㄤ綅鍚嶇О */
+    private String bodyPartsName;
+
+    /** 鏀粯鐘舵��(OrderTotalConstants) */
+    private Integer payStatus;
+
+    /** 閫�娆剧姸鎬� */
+    private Integer refundStatus;
+
+    /** 璁㈠崟鎬婚噾棰� */
+    private BigDecimal total;
+    /** 瀹炰粯閲戦 */
+    private BigDecimal actualTotal;
+    /** 鍘熶环 */
+    private BigDecimal userPaidTotal;
+    /** 鍘熶环 */
+    private BigDecimal oriPrice;
+    /** 鐜颁环 */
+    private BigDecimal curPrice;
+    /** 椤圭洰/鍟嗗搧鐤楃▼鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
+    private Integer single;
+
+    /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) */
+    private BigDecimal discount;
+
+    /** 鎬绘鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
+    private Integer usedTotal;
+
+    /** 璐拱鏁伴噺 */
+    private Integer buyNum;
+
+    /** 瀛愰」璁㈠崟澶囨敞 */
+    private String remarks;
+
+    /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 */
+    private String commonId;
+    /** 鎵ц鏉$洰ID */
+    private String performId;
+    /** 璁㈠崟id锛圤rdersTotal锛� */
+    private String orderId;
+
+    /** 杞叆闂ㄥ簵id */
+    private String transferIntoShopId;
+
+    /** 杞叆闂ㄥ簵鍚嶇О */
+    private String transferIntoShopName;
+
+    /** 鏄惁杞枟 */
+    private Integer isTransfer;
+
+    /** 鏄惁杞禒 */
+    private Integer isTurn;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
new file mode 100644
index 0000000..f3d7783
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wzh
+ * 璁㈠崟缁撹处鎵╁睍
+ */
+@Data
+public class OrderItemRefundDto {
+
+    /** 瀛愯鍗昳d */
+    private String orderItemId;
+    /** 瀹為��鏁� */
+    private Integer refundNum;
+    /** 瀹為��閲戦 */
+    private BigDecimal refundMoney;
+    /** 瀹為��鍘熷洜 */
+    private String refundReason;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
new file mode 100644
index 0000000..b9f6f90
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wzh
+ * 閫�鍥炴敮浠樿褰曟墿灞�
+ */
+@Data
+public class OrderPayMethodDto {
+
+    /** 鏀粯鏂瑰紡缂栫爜 */
+    private String payMethodNo;
+    /** 瀹為��閲戦 */
+    private BigDecimal money;
+
+    public OrderPayMethodDto() {
+    }
+
+    public OrderPayMethodDto(String payMethodNo, BigDecimal money) {
+        this.payMethodNo = payMethodNo;
+        this.money = money;
+    }
+}
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
new file mode 100644
index 0000000..c2c58c0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wzh
+ * 璁㈠崟缁撹处鎵╁睍
+ */
+@Data
+public class OrderRefundDto {
+
+    /** 閫�娆炬柟寮忛泦鍚� */
+    private List<OrderPayMethodDto> refundPayMethod;
+    /** 澶囨敞 */
+    private String remarks;
+    /** 閫�娆句俊鎭泦鍚� */
+    private List<OrderItemRefundDto> refundList;
+    /** 璁㈠崟id */
+    private String orderId;
+    /** 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */
+    private Integer refundType;
+    /** 鎿嶄綔浜篿d */
+    private String operatorId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
new file mode 100644
index 0000000..81c8730
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -0,0 +1,168 @@
+package com.hz.his.dto.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鎬昏鍗�
+ * @author wzh
+ */
+@Data
+public class OrdersTotalDto {
+
+    /** 璁㈠崟id */
+    private String id;
+    /** 璁㈠崟缂栧彿锛屼互S寮�澶�, SyyyyMMdd0000000(鍓嶇紑浠庡瓧鍏歌幏鍙�) */
+    private String orderNo;
+    /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛� */
+    private String type;
+    /** 鐘舵��(OrderTotalConstants) */
+    private Integer status;
+
+    /** 鏀粯鐘舵��(OrderTotalConstants) */
+    private Integer payStatus;
+
+    /** 鏀粯鏃堕棿 */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date payTime;
+
+    /** 閫�娆剧姸鎬� */
+    private Integer refundStatus;
+
+    /** 鍙栨秷鏃堕棿/浣滃簾鏃堕棿 */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date cancelTime;
+
+    /** 璁㈠崟鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙鍏ㄩ儴閲戦,鍖呮嫭浼樻儬浠锋牸锛� */
+    private BigDecimal total;
+    /** 搴斾粯鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙payTotal+鍏朵粬鏀粯妯″紡锛� */
+    private BigDecimal shouldTotal;
+    /** 宸叉敮浠樻�婚噾棰濓紝浠ュ厓涓哄瓨鍌紙payTotal+鍏朵粬鏀粯妯″紡锛� */
+    private BigDecimal actualTotal;
+
+
+    /** 宸叉敮浠樼幇閲戦噾棰濓紙寰俊/鏀粯瀹濇敮浠�/鍏朵粬锛夛紝浠ュ厓涓哄瓨鍌� 榛樿:0 */
+    private BigDecimal payTotal;
+    /** 宸叉敮浠樺偍鍊奸噾閲戦 榛樿:0 */
+    private BigDecimal payRecharge;
+    /** 宸叉敮浠樺鍊奸噾閲戦 榛樿:0 */
+    private BigDecimal payIncrement;
+
+    /** 浼樻儬閲戦锛屼互鍏冧负瀛樺偍 */
+    private BigDecimal discountTotal;
+
+    /** 娲诲姩瑙勫垯浼樻儬鎬婚噾棰� */
+    private BigDecimal activityTotal;
+
+    /** 璧犻�侀噾棰� */
+    private BigDecimal givingAmount;
+    /** 璧犻�侀噾棰濈被鍨�(GivingAmountType) */
+    private String givingType;
+
+    /** 鎵�灞為棬搴楁爣璇嗭紙Shop锛�(鎿嶄綔浜虹殑闂ㄥ簵鍚嶇О) */
+    private String shopId;
+    /** 鎵�灞為棬搴楀悕绉�(鎿嶄綔浜虹殑闂ㄥ簵鍚嶇О) */
+    private String shopName;
+    /** 鎿嶄綔绫诲瀷(0:绯荤粺绠$悊鍛�,1:鍛樺伐,3:绗笁鏂瑰钩鍙�) */
+    private Integer operatorType;
+    /** 涓嬪崟鎿嶄綔浜烘爣璇嗭紙Employee锛� */
+    private String operatorId;
+    /** 涓嬪崟鎿嶄綔浜哄悕绉� */
+    private String operatorName;
+
+    /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+    private String developerShopId;
+    /** 寮�鍙戜汉闂ㄥ簵鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+    private String developerShopName;
+    /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) */
+    private String developerId;
+    /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) */
+    private String developerName;
+
+
+    /*骞冲彴鏉ユ簮**/
+    /** 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+    private String appId;
+    /** 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~) */
+    private String appIdCode;
+    /*閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨*/
+    /** 璁㈠崟鏉ユ簮浠g爜锛堥粯璁�:搴旂敤appId锛� */
+    private String sourceCode;
+    /** 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) */
+    private String sourceName;
+    /** 绗笁鏂硅鍗曞彿 */
+    private String sourceOrderNo;
+    /** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
+    private String conversionCode;
+
+    /** 娓犻亾鏉ユ簮绫诲瀷锛圤rderTotalConstants锛� */
+    private String channelType;
+    /** 娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛� */
+    private String commonId;
+    /** 娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
+    private String commonName;
+
+    /** 绉戝缂栫爜 */
+    private String departmentCode;
+    /** 绉戝鍚嶇О */
+    private String departmentName;
+
+    /** 缇庡甯堟爣璇� */
+    private String beauticianId;
+    /** 缇庡甯堝悕绉� */
+    private String beauticianName;
+
+    /** 鍖荤敓鏍囪瘑 */
+    private String doctorId;
+    /** 鍖荤敓鍚嶇О */
+    private String doctorName;
+
+    /** 鍚屾鐘舵��0鍚�1鏄� */
+    private int hisSynStatus;
+    /** 鍚屾his璁㈠崟鍙� */
+    private String hisOrderId;
+    /** 棰勭害璁㈠崟鏍囪瘑 */
+    private String appointmentId;
+
+    /** 鍓╀綑鍌ㄥ�奸噾,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓� */
+    private String storedValueFund;
+
+    /** 鍓╀綑澧炲�奸噾,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓� */
+    private String valueAddedFund;
+
+    /** 鍓╀綑绉垎,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓� */
+    private String integral;
+
+    /** 浼氬憳绛夌骇 */
+    private String userLevel;
+
+    /** CID */
+    private String CIQ;
+
+    /** 璁㈠崟澶囨敞 */
+    private String remarks;
+
+    /** 鎺ㄨ崘浜烘爣璇� */
+    private String inviteeId;
+
+    /** 鎺ㄨ崘浜哄悕绉�(鍐椾綑) */
+    private String inviteeName;
+
+    /** 鎺ㄨ崘浜烘墍灞炵被鍨�(UserChannelType) */
+    private String userBelongingType;
+
+    /** 鐢ㄦ埛Id */
+    private String userId;
+
+    /** 鍚屾鐘舵��(OrderTotalConstants) */
+    private Integer syncStatus;
+
+    /** 搴峰崥浣虫爣璇�(KoapOrderTotal) */
+    private String koapOrderId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectQueryDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectQueryDto.java
new file mode 100644
index 0000000..746fb96
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectQueryDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.project;
+
+
+import com.hz.his.dto.PageDto;
+
+/**
+ * 椤圭洰鏌ヨ鍙傛暟
+ * @author fwq
+ */
+public class ProjectQueryDto extends PageDto {
+
+    /**椤圭洰鏍囪瘑*/
+    private String projectId;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionQueryDto.java b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionQueryDto.java
new file mode 100644
index 0000000..939e3e9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionQueryDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.promotion;
+
+
+import com.hz.his.dto.PageDto;
+
+/**
+ * 淇冮攢鏌ヨ鍙傛暟
+ * @author fwq
+ */
+public class PromotionQueryDto extends PageDto {
+
+    /**淇冮攢鏍囪瘑*/
+    private String promotionId;
+
+    public String getPromotionId() {
+        return promotionId;
+    }
+
+    public void setPromotionId(String promotionId) {
+        this.promotionId = promotionId;
+    }
+}
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
new file mode 100644
index 0000000..8bcff06
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -0,0 +1,252 @@
+package com.hz.his.dto.user;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 鐢ㄦ埛鍙傛暟
+ * @author wzh
+ */
+@Data
+public class UserParamDto {
+
+    /** 鐢ㄦ埛id */
+    private String userId;
+
+    /** 濮撳悕 */
+    private String name;
+
+    /** 涓荤數璇濆彿鐮� */
+    private String tel;
+
+    /** 鏉ユ簮淇℃伅 */
+    private UserUnionDto userUnion;
+
+    /** 鍥剧墖 */
+    private String imgUrl;
+
+    /** 浼氬憳绛夌骇 */
+    private String userLevel;
+
+    /** 鏄熺骇,100涓�1鏄燂紝150涓�1.5鏄� */
+    private Integer starLevel;
+
+    /** 鐢ㄦ埛绫诲瀷 */
+    private String userType;
+
+    /** 鏉ユ簮id */
+    private String channelId;
+
+    /** 鏉ユ簮 */
+    private String channelType;
+
+    /** 浜岀骇鏉ユ簮id */
+    private String channel2Id;
+
+    /** 浜岀骇鏉ユ簮 */
+    private String channelType2;
+
+    /** QQ */
+    private String QQ;
+
+    /** 鎬у埆 */
+    private Integer gender = SEX_WUMAN;
+
+    /** CIQ */
+    private String CIQ;
+
+    /** 浼氬憳鍙� */
+    private String memberNO;
+
+    /** 澶囨敞 */
+    private String remark;
+
+    /** 娑堣垂閲戦 */
+    private String money;
+
+    /** 涓婁竴娆¢绾︾殑鍖荤敓 */
+    private String lastDoctorId;
+
+    /** 涓婁竴娆¢绾︾殑椤鹃棶 */
+    private String lastCorpUserId;
+
+    /** 璇佷欢绫诲瀷 */
+    private Integer certificateType;
+
+    /** 璇佷欢缂栧彿 */
+    private String certificateNo;
+
+    /** 鐢熸棩yyyy-MM-dd" */
+    private String birthDay;
+
+    /** 宸ヤ綔浜哄憳Id */
+    private String corpUserId;
+
+    /** 鎺ュ彛id */
+    private String apiId;
+
+    /** 鎵�灞為【闂�(閿�鍞【闂�) */
+    private String hisCorpUserId;
+
+    /** 瀹㈡埛寮�鍙戜汉鍛樺伐id */
+    private String customerDeveloperId;
+
+    /** 鎵�灞為棬搴梚d */
+    private String shopId;
+
+    /** 鐢ㄦ埛瑙掕壊 */
+    private Integer userRole;
+
+    /**  鎷奸煶鐮�*/
+    private String pinyinCode;
+
+    /** 鐢电綉鍜ㄨ椤鹃棶 */
+    private String internetCorpUserId;
+
+    /**  鎵�灞炵編瀹瑰笀*/
+    private String beauticianCorpUserId;
+
+    /** 瀹㈡湇涓撳憳 */
+    private String chatCorpUserId;
+
+    /** 鍜ㄨ鍔╃悊 */
+    private String consultCorpUserId;
+
+    /** 鍏变韩瀹㈡埛 */
+    private Integer shareCustomer = 0;
+
+    /** 鎵�灞炴姢澹� */
+    private String nurseCorpUserId;
+
+    /** 鎵�灞炲尰鐢� */
+    private String doctorCorpUserId;
+
+    /** 鍜ㄨ甯堥毝灞� */
+    private String consultBelonging;
+
+    /** 鍥藉绫诲瀷鍚嶇О */
+    private String countryTypeName;
+
+    /** 璇█绫诲瀷鍚嶇О */
+    private String languageTypeName;
+
+    /** 鐢ㄦ埛骞撮緞 */
+    private Integer year = 0;
+
+    /** 鏄熷骇绫诲瀷鍚嶇О */
+    private String constellationTypeName;
+
+    /** 姘戞棌绫诲瀷鍚嶇О */
+    private String nationalityTypeName;
+
+    /** 鑱屼笟绫诲瀷鍚嶇О */
+    private String professionTypeName;
+
+    /** 鏀跺叆绫诲瀷鍚嶇О */
+    private String incomeTypeName;
+
+    /** 濠氬Щ绫诲瀷鍚嶇О */
+    private String marriageTypeName;
+
+    /** 鐢熻偛绫诲瀷鍚嶇О */
+    private String growthTypeName;
+
+    /** 绫嶈疮绫诲瀷鍚嶇О */
+    private String nativePlaceTypeName;
+
+    /** 鍗曚綅鍚嶇О */
+    private String unitName;
+
+    /** 娉婅溅闇�姹� */
+    private Integer isHaveCar = 0;
+
+    /** 杞︾墝鍙风爜 */
+    private String carNumber;
+
+    /** 杩囨晱鏍囩 */
+    private String allergyLabel;
+
+    /** 鍗拌薄鏍囩 json */
+    private String impressionLabelJson;
+
+    /** 鐢ㄦ埛鍏磋叮鐖卞ソjson */
+    private String userInterestsJson;
+
+    /** email */
+    private String email;
+
+    /** 鍟嗗姟閫氱紪鍙� */
+    private String merchantNo;
+
+    /** 鍥哄畾鐢佃瘽 */
+    private String telPhone;
+
+    /** wechat */
+    private String wechat;
+
+    /** Line */
+    private String line;
+
+    /** 鑱旂粶鏂瑰紡 */
+    private String contactType;
+
+    /** 鐢ㄦ埛鍦板潃 json */
+    private String addressJson;
+
+    /** 娆¤鐢佃瘽绨� json */
+    private String phoneBooksJson;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    /** 鏇存柊鏃堕棿 */
+    private Date updateTime;
+
+    /** 閭�璇蜂汉id  鐢ㄦ埛锛屽憳宸� */
+    private String inviteeId;
+
+    /** 娓犻亾鏉ユ簮绫诲瀷 */
+    private String channelCategory= CATEGORY_ONESELF;
+
+    /** 鎬у埆0鏈煡1鐢�2濂� */
+    private Integer sex;
+
+    /** 浼氬憳鍚嶇О */
+    private String memberLevel;
+
+    /** 鎼滅储锛氬仛杩囬」鐩� */
+    private String projectName;
+
+
+    /** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
+    private String consumeStartTime;
+    /** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙寮�濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
+    private String createStartTime;
+    /** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙缁撴潫锛夛紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss */
+    private String createEndTime;
+
+    /**鎬у埆-鏈煡*/
+    public static final Integer SEX_UNKNOWN = 0;
+    /**鎬у埆-鐢�*/
+    public static final Integer SEX_MAN = 1;
+    /**鎬у埆-濂�*/
+    public static final Integer SEX_WUMAN = 2;
+
+    /**娓犻亾绫诲埆-娓犻亾*/
+    public static final String CATEGORY_CHANNEL = "channel";
+    /**娓犻亾绫诲埆-浼氬憳*/
+    public static final String CATEGORY_MEMBERS = "members";
+    /**娓犻亾绫诲埆-鍛樺伐*/
+    public static final String CATEGORY_EMPLOYEE = "employee";
+    /**娓犻亾绫诲埆-鑷繁鏉�*/
+    public static final String CATEGORY_ONESELF = "oneself";
+
+    /*鐢ㄦ埛娉ㄥ唽鎺ㄨ崘浜篿d*/
+    private String referrerId;
+    /*鍚屾棰嗗缓鐨勫弬鏁�*/
+    private boolean internal;
+
+}
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
new file mode 100644
index 0000000..19468ca
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
@@ -0,0 +1,48 @@
+package com.hz.his.dto.user;
+
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鏌ヨ鍙傛暟
+ * @author wzh
+ */
+@Data
+public class UserUnionDto {
+
+    /**
+     * 灏忕▼搴廰ppId/鍏紬鍙穉ppId/鍏朵粬骞冲彴鏍囪瘑
+     */
+    private String fromCode;
+
+    /**
+     * 鏉ユ簮鍚嶇О
+     */
+    private String fromName;
+
+    /**
+     * 灏忕▼搴廰ppId/鍏紬鍙穉ppId/鍏朵粬鏍囪瘑
+     */
+    private String fromAppId;
+
+    /**
+     * 灏忕▼搴弖nionId/鍏紬鍙穟nionId
+     */
+    private String unionId;
+
+    /**
+     * 灏忕▼搴弌penId/鍏紬鍙穙penId
+     */
+    private String openId;
+
+    /**
+     * 鏉ユ簮骞冲彴鐨勭敤鎴锋爣璇�
+     */
+    private String merId;
+
+    /**
+     * 鏉ヤ紒涓氬井淇″憳宸ユ爣璇�
+     */
+    private String corpUserId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
index e32c806..31d9e5c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -5,27 +5,95 @@
 import lombok.Data;
 
 /**
+ * 鐢ㄦ埛浼樻儬鍒�
  * @author fwq
- * 鐢ㄦ埛浼樻儬鍒告墿灞�
- * */
+ */
 @Data
 public class UserCouponDto extends PageDto {
+    /*****************************鍙栨秷浣跨敤*************************/
+    /**绫诲瀷0璁㈠崟1鍏呭��*/
+    private Integer type;
+    /**瀛愯鍗曞彿*/
+    private String orderItemNo;
+
+    /*****************************鏂板浣跨敤******************************/
+    /**phis浼樻儬鍒告爣璇�*/
+    private String couponId;
+    /**鏁伴噺*/
+    private Integer couponNum;
+    /**棰嗗彇绫诲瀷*/
+    private Integer collectionType;
     /**phis鐢ㄦ埛鏍囪瘑*/
     private String userId;
+    /**鎵嬫満鍙�*/
+    private String tel;
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+    /**鎿嶄綔浜虹被鍨�*/
+    private Integer operatorType;
+    /**绠$悊鍛業d*/
+    private String adminId;
+    /**绠$悊鍛樺悕*/
+    private String adminName;
+    /**澶囨敞淇℃伅*/
+    private String remarks;
+    /**鏄惁鐭俊閫氱煡瀹㈡埛*/
+    private Integer isSmsSend;
+    /**鏍囧織鏍囪瘑绫诲瀷:crm,璁㈠崟order,recharge鍏呭��*/
+    private String commonType;
+    /**鏍囧織鏍囪瘑锛堢ぜ鍖呰褰曟爣璇嗘垨鑰呭叾浠栨爣璇嗭級*/
+    private String commonId;
+    /**鏍囧織瀛愭爣璇�*/
+    private String commonItemId;
     /**鏈夋晥鐘舵�侊細0浣滃簾1鏈夋晥*/
     private Integer validState;
     /**鏄惁浣跨敤*/
     private Integer isUse;
-    /**鏍囧織鏍囪瘑绫诲瀷:crm,璁㈠崟order,recharge鍏呭��*/
-    private String commonType;
-    /**鏍囧織鏍囪瘑*/
-    private String commonId;
-    /**鏍囧織瀛愭爣璇�*/
-    private String commonItemId;
     /**璁㈠崟鍙�*/
     private String orderNo;
-    /**瀛愯鍗曞彿*/
-    private String orderItemNo;
     /**鐢ㄦ埛浼樻儬鍒告爣璇�*/
     private String userCouponId;
+
+
+    /**棰嗗彇绫诲瀷-鏈煡*/
+    public static Integer C_TYPE_UNKNOW = -1;
+    /**棰嗗彇绫诲瀷-鐢ㄦ埛鑷*/
+    public static Integer C_TYPE_USER = 0;
+    /**棰嗗彇绫诲瀷-绠$悊鍛樿禒閫�*/
+    public static Integer C_TYPE_ADMIN = 1;
+    /**棰嗗彇绫诲瀷-鍛樺伐璧犻��*/
+    public static Integer C_TYPE_STAFF = 2;
+    /**棰嗗彇绫诲瀷-鍗忓晢璧犻��*/
+    public static Integer C_TYPE_NEGOTIATION = 3;
+    /**棰嗗彇绫诲瀷-鎹㈣揣*/
+    public static Integer C_TYPE_CHANGE = 4;
+    /**棰嗗彇绫诲瀷-鍏呭�肩疮璁¤禒閫�*/
+    public static Integer C_TYPE_RECHARGE_SEND = 5;
+
+    /**浣跨敤绫诲瀷-鏈煡*/
+    public static Integer USE_TYPE_UNKNOW = -1;
+    /**浣跨敤绫诲瀷-鐢ㄦ埛浣跨敤*/
+    public static Integer USE_TYPE_USER = 0;
+    /**浣跨敤绫诲瀷-绠$悊鍛樻牳閿�*/
+    public static Integer USE_TYPE_ADMIN = 1;
+
+    /**鏍囧織鏍囪瘑-璁㈠崟*/
+    public static String COMMON_TYPE_ORDER = "order";
+    /**鏍囧織鏍囪瘑-鍏呭��*/
+    public static String COMMON_TYPE_RECHARGE = "recharge";
+
+
+    /**鍙戦�佺煭淇$姸鎬�-鎴愬姛*/
+    public static Integer NOTE_STARUS_SUCCEED = 1;
+    /**鍙戦�佺煭淇$姸鎬�-澶辫触*/
+    public static Integer NOTE_STARUS_FALL = 0;
+
+    /**鎿嶄綔浜虹被鍨�-绠$悊鍛�*/
+    public static Integer OPERATOR_TYPE_ADMIN = 1;
+    /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+    public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
+    /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
+    public static Integer OPERATOR_TYPE_USER = 2;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
new file mode 100644
index 0000000..deaa482
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -0,0 +1,183 @@
+package com.hz.his.dto.user.money;
+
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 鐢ㄦ埛璧勯噾
+ *
+ * @author fwq
+ */
+@Data
+@ToString
+public class UserMoneyDto {
+    /**
+     * 鎿嶄綔浜虹被鍨�
+     */
+    private Integer operatorType;
+    /**
+     * 鎿嶄綔浜烘爣璇�
+     */
+    private String operatorId;
+    /**
+     * 鎿嶄綔浜哄悕绉�
+     */
+    private String operatorName;
+    /**
+     * 鎿嶄綔澶囨敞
+     */
+    private String remarks;
+
+    /**
+     * 璁板綍绫诲瀷
+     */
+    private Integer recordType;
+    /**
+     * 寮�鍗曠被鍨�
+     */
+    private Integer billingType;
+    /**
+     * 璁㈠崟鏍囪瘑
+     */
+    private String orderId;
+    /**
+     * 璁㈠崟缂栧彿
+     */
+    private String orderNo;
+
+    /**
+     * phis鐢ㄦ埛鏍囪瘑
+     */
+    private String userId;
+    /**
+     * 鍙樺寲鐨勫偍鍊奸噾锛堟鏁板姞锛岃礋鏁板噺锛�
+     */
+    private String storedValueFund;
+    /**
+     * 鍙樺寲鐨勫鍊奸噾锛堟鏁板姞锛岃礋鏁板噺锛�
+     */
+    private String valueAddedFund;
+    /**
+     * 鍙樺寲鐨勭Н鍒嗭紙姝f暟鍔狅紝璐熸暟鍑忥級
+     */
+    private String integral;
+    /**
+     * 鍙樺寲鐨勯瀹氶噾锛堟鏁板姞锛岃礋鏁板噺锛�
+     */
+    private String deposit;
+
+    /**
+     * 鏁版嵁绛惧悕
+     */
+    private String sign;
+    /**
+     * 鏁版嵁绛惧悕缂栫爜
+     */
+    private String signCode;
+
+
+    /**鐢ㄦ埛璧勪骇鎿嶄綔*/
+    /**
+     * 璧勯噾绫诲瀷 鍌ㄥ�奸噾 0 澧炲�奸噾 1  绉垎 2 棰勫畾閲� 3
+     */
+    private Integer fundType;
+    /**
+     * 鎿嶄綔绫诲瀷  鍙傝�冩枃妗�  recharge
+     */
+    private String operationReason;
+    /**
+     * 鎿嶄綔閲戦
+     */
+    private String opNumber;
+    /**
+     * 鏉ユ簮娓犻亾
+     */
+    private String originChannel;
+    /**
+     * 鏉ユ簮
+     */
+    private String originSubject;
+    /*寰呴鍙栧垪琛╥d*/
+    private String id;
+    /*鐘舵�佹槸鍚﹂鍙� (0 寰呴鍙� 1 宸查鍙�)*/
+    private Integer status;
+    /*璧勯噾鎿嶄綔绫诲瀷 榛樿涓哄鍔�   澧炲姞 1  鍑忓皯 0*/
+    private Integer fundOpType;
+    /* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
+    private Integer opType;
+
+
+    /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
+    /**
+     * 搴旂敤绫诲瀷-绗笁鏂瑰钩鍙�
+     */
+    public static final int APP_TYPE_API = 0;
+    /**
+     * 搴旂敤绫诲瀷-棰勭害鍚庡彴
+     */
+    public static final int APP_TYPE_ADMIN = 1;
+
+    /**
+     * 鎿嶄綔浜虹被鍨�-鐢ㄦ埛
+     */
+    public static final int OPERATOR_TYPE_USER = 0;
+    /**
+     * 鎿嶄綔浜虹被鍨�-鍛樺伐
+     */
+    public static final int OPERATOR_TYPE_EMPLOYEE = 1;
+    /**
+     * 鎿嶄綔浜虹被鍨�-绠$悊鍛�
+     */
+    public static final int OPERATOR_TYPE_ADMIN = 2;
+    /**
+     * 鎿嶄綔浜虹被鍨�-绯荤粺
+     */
+    public static final int OPERATOR_TYPE_SYSTEM = 3;
+
+    /**
+     * 璁板綍绫诲瀷-绯荤粺璁板綍
+     */
+    public static final int RECORD_TYPE_SYSTEM = 0;
+    /**
+     * 璁板綍绫诲瀷-鍏呭�艰褰�
+     */
+    public static final int RECORD_TYPE_RECHARGE = 1;
+    /**
+     * 璁板綍绫诲瀷-閫�娆捐褰�
+     */
+    public static final int RECORD_TYPE_REFUND = 2;
+    /**
+     * 璁板綍绫诲瀷-鎶垫墸璁板綍
+     */
+    public static final int RECORD_TYPE_DEDUCTION = 3;
+    /**
+     * 璁板綍绫诲瀷-杞禒璁板綍
+     */
+    public static final int RECORD_TYPE_TURN = 4;
+    /**
+     * 璁板綍绫诲瀷-璐拱璁板綍
+     */
+    public static final int RECORD_TYPE_BUY = 5;
+    /**
+     * 璁板綍绫诲瀷-鍗忓晢璁板綍
+     */
+    public static final int RECORD_TYPE_NEGOTIATION = 6;
+    /**
+     * 璁板綍绫诲瀷-閫�璐ц褰�
+     */
+    public static final int RECORD_TYPE_RETURN = 7;
+    /**
+     * 璁板綍绫诲瀷-鎹㈣揣璁板綍
+     */
+    public static final int RECORD_TYPE_CHANGE = 8;
+
+    /**
+     * 寮�鍗曠被鍨�-鎵嬪姩璋冩暣
+     */
+    public static final int BILLING_TYPE_MANUAL = 0;
+    /**
+     * 寮�鍗曠被鍨�-璁㈠崟璋冩暣
+     */
+    public static final int BILLING_TYPE_ORDER = 1;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SWxTokenService.java b/phis-feign/src/main/java/com/hz/his/feign/service/SWxTokenService.java
deleted file mode 100644
index 9bbddcd..0000000
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SWxTokenService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.hz.his.feign.service;
-
-import com.hx.resultTool.Result;
-import com.hz.his.dto.token.GetTokenDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
- */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-token")
-public interface SWxTokenService {
-
-    /**
-     *鑾峰彇灏忕▼搴忎紒涓氬井淇″簲鐢╰oken
-     * 杞寲浣跨敤 WxTokenDt
-     * @param getTokenDto 瀵硅薄
-     * @return
-     */
-    @PostMapping(value = "/account_token/apply/get_token")
-    Result corpApplyToken(@RequestBody GetTokenDto getTokenDto);
-
-    /**
-     *鑾峰彇灏忕▼搴忔櫘閫歵oken
-     * 杞寲浣跨敤 WxTokenDt
-     * @param getTokenDto 瀵硅薄
-     * @return
-     */
-    @PostMapping(value = "/account_token/mp/get_token")
-    Result mpToken(@RequestBody GetTokenDto getTokenDto);
-
-
-    /**
-     *鑾峰彇鍏紬鍙锋櫘閫歵oken
-     * 杞寲浣跨敤 WxTokenDt
-     * @param getTokenDto 瀵硅薄
-     * @return
-     */
-    @PostMapping(value = "/account_token/weChat/get_token")
-    Result weChatToken(@RequestBody GetTokenDto getTokenDto);
-
-}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SCardItemService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SCardItemService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
index ae17171..7de6199 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SCardItemService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SChannelsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SChannelsService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
index 3369758..d8386a2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SChannelsService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SChannelsService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
similarity index 96%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SConsumablesService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index 427b5c9..d745c62 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SCouponService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 39959ee..9673a12 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 
 import com.hx.resultTool.Result;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SDictionariesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDictionariesService.java
similarity index 94%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SDictionariesService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SDictionariesService.java
index 358fb7e..d6d80a3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SDictionariesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDictionariesService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.dictionaries.DictionariesDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SEmployeeService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 11c0f2f..3e16eff 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 
 import com.hx.resultTool.Result;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SFileService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index 068f7fc..fa00de5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.file.FileDownDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SGzhService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SGzhService.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SGzhService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SGzhService.java
index f7c9149..d511465 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SGzhService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SGzhService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.gzh.GzhDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SLabelService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index 6205fe1..c48d119 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SLimitService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SLimitService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
index 456db34..92e919f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SLimitService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLimitService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.limit.LimitDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SMemberLevelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
similarity index 96%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SMemberLevelService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
index 3fc31d2..6390296 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SMemberLevelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMemberLevelService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 
 import com.hx.resultTool.Result;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderGeneralService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SOrderGeneralService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java
index 7507463..3de2ac7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderGeneralService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SOrderService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
index af898cf..4d13c27 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.order.OrderDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderUseProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderUseProjectService.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SOrderUseProjectService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderUseProjectService.java
index f27b128..611f3b5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SOrderUseProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderUseProjectService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
similarity index 98%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SProjectService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index bdc26bc..e81f706 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
similarity index 96%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SPromotionService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
index ba272ed..1fa3065 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SPromotionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SSectionRoomService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSectionRoomService.java
similarity index 94%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SSectionRoomService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SSectionRoomService.java
index 90edf2e..98947f5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SSectionRoomService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SSectionRoomService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 
 import com.hx.resultTool.Result;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SShopService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
similarity index 96%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SShopService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
index 91843a6..4321960 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SShopService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 
 import com.hx.resultTool.Result;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
similarity index 94%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SUserLabelService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
index a5bba26..c64c340 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import org.springframework.cloud.openfeign.FeignClient;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserLevelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLevelService.java
similarity index 81%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SUserLevelService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLevelService.java
index 049c7ed..30388e8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserLevelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLevelService.java
@@ -1,12 +1,4 @@
-package com.hz.his.feign.service;
-
-/**
- * @ClassName SUserLevelService
- * @Description 浼氬憳绛夌骇
- * @Author Wrh
- * @Date 2022/6/24 10:47
- * @Version 1.0
- */
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.member.MemberDto;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 3f9e604..a8f13f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -1,4 +1,4 @@
-package com.hz.his.feign.service;
+package com.hz.his.feign.service.phis;
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.user.UserAppointmentDto;
@@ -195,4 +195,16 @@
     @PostMapping(value = "/user/wait/increment/list")
     Result userWaitIncList(@RequestBody UserWaitIncDto userWaitIncDto);
 
+    /**
+     * 鑾峰彇鐢ㄦ埛棰滃�艰鍒掑垪琛�
+     * */
+    @PostMapping(value = "/user/appearance/list")
+    Result userAppearanceList(@RequestBody UserDto userDto);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛棰滃�艰鍒掕鎯�
+     * */
+    @PostMapping(value = "/user/appearance/info")
+    Result userAppearanceInfo(@RequestParam("appearanceId") String appearanceId);
+
 }
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCardItemService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCardItemService.java
new file mode 100644
index 0000000..f8b418b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCardItemService.java
@@ -0,0 +1,29 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.card.CardQueryDto;
+import com.hz.his.dto.project.ProjectQueryDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-cardItem")
+public interface SPhipCardItemService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鍗¢」鍒楄〃
+     */
+    @PostMapping(value = "/card/list")
+    Result cardList(@RequestBody CardQueryDto cardQueryDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍗¢」璇︽儏
+     */
+    @PostMapping(value = "/card/detail")
+    Result cardDetail(@RequestBody CardQueryDto cardQueryDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsumableService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsumableService.java
new file mode 100644
index 0000000..8bd5158
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsumableService.java
@@ -0,0 +1,37 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.consumables.GoodsQueryDto;
+import com.hz.his.dto.user.UserParamDto;
+import com.hz.his.dto.user.UserUnionDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-consumable")
+public interface SPhipConsumableService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鑰楁潗鍒嗙被鍒楄〃
+     */
+    @PostMapping(value = "/goods/type/list")
+    Result goodsTypeList(@RequestBody PageDto pageDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鑰楁潗鍒楄〃
+     */
+    @PostMapping(value = "/goods/list")
+    Result goodsList(@RequestBody GoodsQueryDto goodsQueryDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鑰楁潗璇︽儏
+     */
+    @PostMapping(value = "/goods/detail")
+    Result goodsDetail(@RequestBody GoodsQueryDto goodsQueryDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
new file mode 100644
index 0000000..faff2c7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -0,0 +1,35 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+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;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-coupon")
+public interface SPhipCouponService {
+
+    /**
+     * 寮�鏀惧钩鍙�-浼樻儬鍒稿垪琛�(鍚寚瀹�)
+     */
+    @PostMapping(value = "/coupon/list/all")
+    Result getCouponList(@RequestBody CouponDto couponDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛
+     */
+    @PostMapping(value = "/coupon/send/coupon")
+    Result sendUserCoupon(@RequestBody CouponDto couponDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
+     */
+    @PostMapping(value = "/coupon/cancel/coupon")
+    Result cancelUserCoupon(@RequestBody CouponDto couponDto);
+
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
new file mode 100644
index 0000000..5ca97ca
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -0,0 +1,49 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.user.UserParamDto;
+import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.money.UserMoneyDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-money")
+public interface SPhipMoneyService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鎿嶄綔鐢ㄦ埛璧勯噾鎺ュ彛
+     */
+    @PostMapping(value = "/user/money/unclaimed/add")
+    Result unclaimedAdd(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇棰嗗彇璁板綍鍒楄〃
+     */
+    @PostMapping(value = "/user/money/unclaimed/receive/list")
+    Result receiveList(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-棰嗗彇鐢ㄦ埛璧勪骇
+     */
+    @PostMapping(value = "/user/money/unclaimed/receive")
+    Result receive(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛寰呴鍙栬褰�
+     */
+    @PostMapping(value = "/user/money/unclaimed/cancel")
+    Result unclaimedCancel(@RequestBody UserMoneyDto userMoneyDto);
+
+
+
+
+
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..430e340
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -0,0 +1,46 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.card.CardQueryDto;
+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 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-order")
+public interface SPhipOrderService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
+     */
+    @PostMapping(value = "/newSync/order/add")
+    Result createOrder(@RequestParam("params") String params);
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
+     */
+    @PostMapping(value = "/newSync/order/orderUpdate")
+    Result updateOrderStatus(@RequestParam("params") String params);
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
+     */
+    @PostMapping(value = "/newSync/order/pay")
+    Result payOrderSuc(@RequestParam("params") String params);
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
+     */
+    @PostMapping(value = "/newSync/order/refund")
+    Result refundOrder(@RequestParam("params") String params);
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
+     */
+    @PostMapping(value = "/newSync/order/cancel")
+    Result cancelOrder(@RequestParam("params") String params);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
new file mode 100644
index 0000000..5369c16
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
@@ -0,0 +1,36 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.consumables.GoodsQueryDto;
+import com.hz.his.dto.project.ProjectQueryDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-project")
+public interface SPhipProjectService {
+
+    /**
+     * 寮�鏀惧钩鍙�-椤圭洰鍒嗙被鍒楄〃
+     */
+    @PostMapping(value = "/project/type/list")
+    Result projectTypeList(@RequestBody PageDto pageDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-椤圭洰鍒楄〃
+     */
+    @PostMapping(value = "/project/list")
+    Result projectList(@RequestBody ProjectQueryDto projectQueryDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-椤圭洰璇︽儏
+     */
+    @PostMapping(value = "/project/detail")
+    Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPromotionService.java
new file mode 100644
index 0000000..0e4880e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPromotionService.java
@@ -0,0 +1,28 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.card.CardQueryDto;
+import com.hz.his.dto.promotion.PromotionQueryDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-promotion")
+public interface SPhipPromotionService {
+
+    /**
+     * 寮�鏀惧钩鍙�-淇冮攢鍒楄〃
+     */
+    @PostMapping(value = "/promotion/list")
+    Result promotionList(@RequestBody PromotionQueryDto promotionQueryDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-淇冮攢璇︽儏
+     */
+    @PostMapping(value = "/promotion/detail")
+    Result promotionDetail(@RequestBody PromotionQueryDto promotionQueryDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
new file mode 100644
index 0000000..e59e3af
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
@@ -0,0 +1,28 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.card.CardQueryDto;
+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 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-treat")
+public interface SPhipTreatService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曡鎯�
+     */
+    @PostMapping(value = "/treat/confirmTreatNotice")
+    Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId);
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曠‘璁�
+     */
+    @PostMapping(value = "/treat/confirmTreatNotice")
+    Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId);
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..a66d934
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -0,0 +1,53 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.token.GetTokenDto;
+import com.hz.his.dto.user.UserParamDto;
+import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user")
+public interface SPhipUserService {
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
+     */
+    @PostMapping(value = "/user/add")
+    Result addUser(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛
+     */
+    @PostMapping(value = "/user/edit")
+    Result editUser(@RequestBody UserParamDto userParamDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鏂板/淇敼鏉ユ簮
+     */
+    @PostMapping(value = "/user/unionId/edit")
+    Result editUnionUser(@RequestBody UserUnionDto userUnionDto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛椤圭洰
+     */
+    @PostMapping(value = "/user/project/cancel")
+    Result cancelUserProject(@RequestBody UserProjectDto userProjectDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鏍规嵁瀛愯鍗曞彿鍙栨秷鐢ㄦ埛浼樻儬鍒�
+     */
+    @PostMapping(value = "/user/coupon/cancel")
+    Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto);
+
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
new file mode 100644
index 0000000..f949fc7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SWxTokenService.java
@@ -0,0 +1,54 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.token.GetTokenDto;
+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.RequestHeader;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
+ * url :鎸囧畾鍦板潃(token缁熶竴鎷跨嚎涓�,鎵�浠ラ渶瑕佹寚瀹�)
+ */
+@FeignClient(name="phi-platform-service",url = "https://phiapi.phiskin.com",path = "/phip",contextId = "phip-token")
+public interface SWxTokenService {
+
+    /**
+     *鑾峰彇灏忕▼搴忎紒涓氬井淇″簲鐢╰oken
+     * 杞寲浣跨敤 WxTokenDt
+     * @param getTokenDto 瀵硅薄
+     * @return
+     */
+    @PostMapping(value = "/account_token/apply/get_token")
+    Result corpApplyToken(@RequestBody GetTokenDto getTokenDto,
+                          @RequestHeader(name = "appId",required = true) String appId,
+                          @RequestHeader(name = "sign",required = true) String sign,
+                          @RequestHeader(name = "appIdCode",required = false) String appIdCode);
+
+    /**
+     *鑾峰彇灏忕▼搴忔櫘閫歵oken
+     * 杞寲浣跨敤 WxTokenDt
+     * @param getTokenDto 瀵硅薄
+     * @return
+     */
+    @PostMapping(value = "/account_token/mp/get_token")
+    Result mpToken(@RequestBody GetTokenDto getTokenDto,
+                   @RequestHeader(name = "appId",required = true) String appId,
+                   @RequestHeader(name = "sign",required = true) String sign,
+                   @RequestHeader(name = "appIdCode",required = false) String appIdCode);
+
+
+    /**
+     *鑾峰彇鍏紬鍙锋櫘閫歵oken
+     * 杞寲浣跨敤 WxTokenDt
+     * @param getTokenDto 瀵硅薄
+     * @return
+     */
+    @PostMapping(value = "/account_token/weChat/get_token")
+    Result weChatToken(@RequestBody GetTokenDto getTokenDto,
+                       @RequestHeader(name = "appId",required = true) String appId,
+                       @RequestHeader(name = "sign",required = true) String sign,
+                       @RequestHeader(name = "appIdCode",required = false) String appIdCode);
+
+}
\ No newline at end of file

--
Gitblit v1.8.0