From 3ce49a33f639f601e7259a9839a235647b90eac9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 22 七月 2022 18:02:21 +0800
Subject: [PATCH] 修改dt
---
phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java | 15
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectTypeListBo.java | 30
phis-feign/src/main/java/com/hz/phis/dt/card/CardListDt.java | 42 +
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitPlatformDt.java | 29
phis-feign/src/main/java/com/hz/phis/dt/member/MemberLevelDt.java | 24
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java | 58 +
phis-feign/src/main/java/com/hz/phis/dt/BaseDt.java | 59 +
phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeListDt.java | 112 ++
phis-feign/src/main/java/com/hz/phis/dt/card/CardInfoDt.java | 46 +
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitBirthdayDt.java | 38
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsBo.java | 25
phis-feign/src/main/java/com/hz/phis/dt/BaseRequestDt.java | 37
phis-feign/src/main/java/com/hz/phis/dt/member/MemberListDt.java | 17
phis-feign/src/main/java/com/hz/phis/dt/card/CardItemDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelListDt.java | 17
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsListDt.java | 50 +
phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java | 24
phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateDt.java | 40 +
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitMemberDt.java | 32
phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponListDt.java | 82 ++
phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java | 201 +++++
phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDetailDt.java | 44 +
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsTypeListDt.java | 28
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 175 ++++
phis-feign/src/main/java/com/hz/phis/dt/card/CardEquityDt.java | 31
phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateListDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectUpdateDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/card/CardDetailListDt.java | 21
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListBo.java | 46 +
phis-feign/src/main/java/com/hz/phis/dt/user/UserProItemDt.java | 75 +
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitOtherDt.java | 33
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsValueBo.java | 23
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitUpdateDt.java | 27
phis-feign/src/main/java/com/hz/phis/dt/ListDt.java | 29
phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponAppointDt.java | 18
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitDt.java | 23
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListDt.java | 16
phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionListDt.java | 49 +
phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceListDt.java | 15
phis-feign/src/main/java/com/hz/phis/dt/limit/LimitListDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/shop/ShopListDt.java | 21
phis-feign/src/main/java/com/hz/phis/dt/AccessTokenDt.java | 28
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDt.java | 14
phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceDt.java | 58 +
phis-feign/src/main/java/com/hz/his/feign/service/SWxTokenService.java | 4
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDeLimitBo.java | 17
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java | 144 +++
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java | 17
phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java | 260 ++++++
phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDeLimitDt.java | 20
51 files changed, 2,282 insertions(+), 2 deletions(-)
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
index f4654c4..011b88c 100644
--- 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
@@ -14,7 +14,7 @@
/**
*鑾峰彇灏忕▼搴忎紒涓氬井淇″簲鐢╰oken
- * 杞寲浣跨敤 WxTokenVo
+ * 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
* @return
*/
@@ -23,7 +23,7 @@
/**
*鑾峰彇灏忕▼搴忓钩鍙皌oken
- * 杞寲浣跨敤 WxTokenVo
+ * 杞寲浣跨敤 WxTokenDt
* @param getTokenDto 瀵硅薄
* @return
*/
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/AccessTokenDt.java b/phis-feign/src/main/java/com/hz/phis/dt/AccessTokenDt.java
new file mode 100644
index 0000000..4c2009c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/AccessTokenDt.java
@@ -0,0 +1,28 @@
+package com.hz.phis.dt;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class AccessTokenDt {
+
+ /**閿欒鐮�*/
+ private String code;
+ /**閿欒淇℃伅*/
+ private String msg;
+
+ /**鍑瘉*/
+ @JSONField(name = "access_token")
+ private String accessToken;
+ /**鍑瘉鐨勬湁鏁堟椂闂�*/
+ @JSONField(name = "expires_surplus")
+ private long expiresIn;
+ /**鍓╀綑鏈夋晥鏃堕棿锛堢锛�*/
+ @JSONField(name = "expires_surplus")
+ private long expiresSurplus;
+ /**鏈夋晥鏃堕棿寮�濮嬫椂闂�*/
+ @JSONField(name = "create_time")
+ private String createTime;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/BaseDt.java b/phis-feign/src/main/java/com/hz/phis/dt/BaseDt.java
new file mode 100644
index 0000000..e941a3b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/BaseDt.java
@@ -0,0 +1,59 @@
+package com.hz.phis.dt;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍩虹瀹炰綋绫�
+ */
+public class BaseDt implements Serializable {
+
+ private String id;
+
+ private Integer isDel;
+
+ private Date createTime;
+
+ private Date editTime;
+
+
+ public static final int NO = 0;
+ public static final int YES = 1;
+
+ public BaseDt()
+ {
+
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public Integer getIsDel() {
+ return isDel;
+ }
+
+ public void setIsDel(Integer isDel) {
+ this.isDel = isDel;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getEditTime() {
+ return editTime;
+ }
+
+ public void setEditTime(Date editTime) {
+ this.editTime = editTime;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/BaseRequestDt.java b/phis-feign/src/main/java/com/hz/phis/dt/BaseRequestDt.java
new file mode 100644
index 0000000..4679118
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/BaseRequestDt.java
@@ -0,0 +1,37 @@
+package com.hz.phis.dt;
+
+/**鍩虹鎺ユ敹
+ *
+ */
+public class BaseRequestDt {
+ /**閿欒鐮�*/
+ private String code;
+ /**閿欒淇℃伅*/
+ private String msg;
+ /**鏁版嵁婧�*/
+ private String data;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/ListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/ListDt.java
new file mode 100644
index 0000000..965c1e9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/ListDt.java
@@ -0,0 +1,29 @@
+package com.hz.phis.dt;
+
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍒楄〃鎺ユ敹瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class ListDt {
+ /**鎬绘暟閲�*/
+ private Integer total;
+ /**姣忛〉鏁伴噺*/
+ private Integer pages;
+ /**椤�*/
+ private Integer pageNum;
+ /**姣忛〉鏁伴噺*/
+ private Integer pageSize;
+ /**鏄惁鏈�鍚庝竴椤�*/
+ private Boolean isLastPage;
+ /**闆嗗悎*/
+ private List<Map<String,Object>> list;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardDetailListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDetailListDt.java
new file mode 100644
index 0000000..fa83e04
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDetailListDt.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.card;
+
+
+
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 淇冮攢鏉冪泭璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardDetailListDt extends CardListDt {
+ /**鍗￠」璇︽儏淇℃伅*/
+ private List<CardEquityDt> cardInfoList;
+ /**闄愬埗淇℃伅*/
+ private LimitDt limitBo;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
new file mode 100644
index 0000000..fbba802
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.card;
+
+
+import lombok.Data;
+
+/**
+ * 鍗￠」鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardDt {
+ private CardDetailListDt cardItem;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardEquityDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardEquityDt.java
new file mode 100644
index 0000000..3d45996
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardEquityDt.java
@@ -0,0 +1,31 @@
+package com.hz.phis.dt.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鍗￠」鏉冪泭瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardEquityDt {
+ /**鍗￠」鏉冪泭淇℃伅鏍囪瘑*/
+ private String id;
+ /**鏉冪泭绫诲瀷*/
+ private Integer equityType;
+ /**缁勫悕绉�*/
+ private String groupName;
+ /**鏉′欢鍊�(鐢ㄤ簬N閫夊嚑,鍑犳鍗＄瓑)*/
+ private Integer value;
+ /**鍒嗘憡閲戦(榛樿涓�0)*/
+ private BigDecimal shareMoney;
+ /**鎸囨暟 (鍚屼竴涓粍鍚嶇О鍙兘鏈夊涓寚鏁�)*/
+ private Integer indexValue;
+ /**鍗￠」鏍囪瘑*/
+ private String cardItemId;
+ /**璇︽儏*/
+ private List<CardInfoDt> infoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardInfoDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardInfoDt.java
new file mode 100644
index 0000000..74f1523
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardInfoDt.java
@@ -0,0 +1,46 @@
+package com.hz.phis.dt.card;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鍗￠」璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardInfoDt {
+ /**鍗￠」璇︽儏淇℃伅鏍囪瘑*/
+ private String id;
+ /**缂栧彿(椤圭洰/鍟嗗搧/澧炲�奸噾/鍌ㄥ�奸噾/绉垎/椤圭洰鍒嗙被/鍟嗗搧鍒嗙被)*/
+ private String commonCode;
+ /**鍏叡鏍囪瘑(椤圭洰/鍟嗗搧/澧炲�奸噾(PaymentMethod)/鍌ㄥ�奸噾(PaymentMethod)/绉垎(PaymentMethod)*/
+ private String commonId;
+ /**鍏叡鍚嶇О(椤圭洰/鍟嗗搧鍚嶇О/澧炲�奸噾(PaymentMethod)/鍌ㄥ�奸噾(PaymentMethod)/绉垎(PaymentMethod)*/
+ private String commonName;
+ /**鍏叡绫诲瀷(project椤圭洰锛宺etail鍟嗗搧锛宨ncrement澧炲�奸噾锛宻tored鍌ㄥ�奸噾锛宨ntegral绉垎锛岄」鐩垎绫籶roject_type锛宺etail_type鍟嗗搧鍒嗙被)*/
+ private String commonType;
+ /**瑙勬牸*/
+ private String specJson;
+ /**鍗曚环鍘熶环*/
+ private BigDecimal price;
+ /**鏈�澶ф鏁�*/
+ private Integer maxNum;
+ /**鍛樺伐涓氱哗娆℃暟*/
+ private Integer emResultsNum;
+ /**鍒嗘憡閲戦*/
+ private BigDecimal shareMoney;
+ /**姣忔鍒掓墸鐨勬墸鍑忔鏁�*/
+ private Integer everyDrawNum;
+ /**姣忔鍒掓墸鐨勫垎鎽婇噾棰�*/
+ private BigDecimal everyShareMoney;
+ /**鍗￠」鏍囪瘑*/
+ private String cardItemId;
+ /**鍗￠」鏉冪泭鏍囪瘑*/
+ private String cardEquityId;
+
+ /**浣跨敤鏁伴噺*/
+ private Integer usedNum;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardItemDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardItemDt.java
new file mode 100644
index 0000000..b41b2f0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardItemDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.card;
+
+
+import lombok.Data;
+
+/**
+ * 鍗￠」鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardItemDt {
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/card/CardListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/card/CardListDt.java
new file mode 100644
index 0000000..0ff3311
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/card/CardListDt.java
@@ -0,0 +1,42 @@
+package com.hz.phis.dt.card;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鍗￠」鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class CardListDt extends BaseDt {
+ /**涓婁笅鏋�*/
+ private Integer isUp;
+ /**缂栧彿*/
+ private String code;
+ /**鍗￠」鍚�*/
+ private String name;
+ /**鐘舵�� inactivated鏈紑濮�,sales閿�鍞腑,off_shelves鏆傚仠閿�鍞�,overdue杩囨湡,disabled浣滃簾*/
+ private String status;
+ /**鍗￠」鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙鍏ㄩ儴閲戦,鍖呮嫭浼樻儬浠锋牸,鍞环锛�*/
+ private BigDecimal total;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**闂ㄥ簵鍚嶇О*/
+ private String shopName;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private String startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private String endTime;
+ /**鍒楄〃*/
+ private List<CardItemDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java b/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java
new file mode 100644
index 0000000..cb71127
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java
@@ -0,0 +1,24 @@
+package com.hz.phis.dt.channel;
+
+
+
+public class ChannelDt {
+ private String id;
+ private String name;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelListDt.java
new file mode 100644
index 0000000..7081125
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelListDt.java
@@ -0,0 +1,17 @@
+package com.hz.phis.dt.channel;
+
+import java.util.List;
+
+
+public class ChannelListDt {
+
+ private List<ChannelDt> list;
+
+ public List<ChannelDt> getList() {
+ return list;
+ }
+
+ public void setList(List<ChannelDt> list) {
+ this.list = list;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
new file mode 100644
index 0000000..8284598
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
@@ -0,0 +1,17 @@
+package com.hz.phis.dt.consumables;
+
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧璇︽儏闄愬埗瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class GoodsDeLimitDt {
+ /**鍟嗗搧淇℃伅*/
+ private GoodsDetailDt consumables;
+ /**闄愬埗淇℃伅*/
+ private LimitDt limitBo;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
new file mode 100644
index 0000000..b92d257
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
@@ -0,0 +1,175 @@
+package com.hz.phis.dt.consumables;
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鍟嗗搧璇︽儏瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class GoodsDetailDt extends BaseDt {
+ /**绫诲瀷(1鍟嗗搧2鑽搧)*/
+ private Integer type;
+ /**缂栧彿*/
+ private String serialNumber;
+ /**榛樿杩涗环*/
+ private BigDecimal buyPrice;
+ /**鍞环*/
+ private BigDecimal price;
+ /**鏈�楂橀浂鍞环鏍硷紙鍏冿級*/
+ private BigDecimal priceMax;
+ /**鏈�浣庨浂鍞环鏍硷紙鍏冿級*/
+ private BigDecimal priceMin;
+ /**鑰楁潗鍚嶇О(涓枃鍚嶇О)*/
+ private String name;
+ /**瑙勬牸*/
+ private String spec;
+ /**鍗曚綅*/
+ private String unitIdCode;
+ /**鍗曚綅鍚嶇О*/
+ private String unitName;
+ /**鏄惁涓婁笅鏋�*/
+ private Integer isUp;
+ /**鍒嗙被鏍囪瘑*/
+ private String consumablesTypeId;
+ /**鍒嗙被鍚嶇О*/
+ private String consumablesTypeName;
+ /**涓枃绠�绉�*/
+ private String abbreviation;
+ /**鑻辨枃鍚嶇О*/
+ private String englishName;
+ /**鑻辨枃绠�绉�*/
+ private String englishAbbreviation;
+ /**绫诲瀷缂栫爜*/
+ private String typeCode;
+ /**绫诲瀷鍚嶇О*/
+ private String typeName;
+ /**鍝佺墝*/
+ private String brand;
+ /**浜у湴*/
+ private String origin;
+ /**鏈�灏忚捣璁㈤噺*/
+ private String minimumOrderQuantity;
+ /**鐢熶骇鍘傚*/
+ private String manufacturer;
+ /**鍘傚鏉″舰鐮�*/
+ private String manufacturerBarcode;
+ /**鍐呴儴鏉″舰鐮�*/
+ private String internalBarcode;
+ /**鎵瑰噯鏂囧彿*/
+ private String approvalNum;
+ /**娉ㄥ唽璇佸彿*/
+ private String registerNum;
+ /**澶囨鍙�*/
+ private String recordNum;
+ /**鏍囧噯缂栫爜*/
+ private String standardCode;
+ /**鏍囧噯鍚嶇О*/
+ private String standardName;
+ /**鏍囩*/
+ private String tag;
+ /**鎼滅储鎷奸煶*/
+ private String searchPinyin;
+ /**閲囪喘绫诲瀷*/
+ private String purchaseTypeCode;
+ /**閲囪喘绫诲瀷鍚嶇О*/
+ private String purchaseTypeName;
+ /**鏀跺叆璁″叆*/
+ private String incomeIncludedCode;
+ /**鏀跺叆璁″叆鍚嶇О*/
+ private String incomeIncludedName;
+ /**鏀跺叆涓讳綋*/
+ private String incomeSubjectCode;
+ /**鏀跺叆涓讳綋鍚嶇О*/
+ private String incomeSubjectName;
+ /**浣跨敤璇存槑*/
+ private String usageCode;
+ /**浣跨敤璇存槑鍚嶇О*/
+ private String usageName;
+ /**浠锋牸鏍囩*/
+ private String priceTagCode;
+ /**浠锋牸鏍囩鍚嶇О*/
+ private String priceTagName;
+ /**绉戝鏍囪瘑*/
+ private String familiesRoomCode;
+ /**绉戝鍚嶇О*/
+ private String departmentName;
+ /**鏄惁鍩鸿嵂*/
+ private Integer isBaseMedicine;
+ /**鏄惁鎵瑰彿绠＄悊*/
+ private Integer isBatchNumber;
+ /**鏄惁璧犻�佺Н鍒�*/
+ private Integer isGiftPoints;
+ /**鏄惁鍙敭*/
+ private Integer isAvailableForSale;
+ /**鏄惁鎴愪氦*/
+ private Integer isMakeADeal;
+ /**鏄惁闄㈠唴鑷埗*/
+ private Integer HomeMade ;
+ /**澶囨敞*/
+ private String remark;
+ /**hisId*/
+ private String hisId;
+ /**********鍟嗗搧瀛楁***************/
+ /**鑰楁潗鏍囪瘑*/
+ private String consumableId;
+ /**鏄惁妞嶅叆鏉愭枡*/
+ private Integer isImplantMaterial;
+ /**鏄惁楂樺�艰�楁潗*/
+ private Integer isHighValue;
+ /**涓氭��*/
+ private String formatCode;
+ /**涓氭�佸悕*/
+ private String format;
+ /*********鑽搧瀛楁*********************/
+ /**鑽搧閫氱敤鍚�*/
+ private String commonName;
+ /**鏄惁鏄鏂硅嵂*/
+ private Integer isPrescription;
+ /**澶勬柟璧勮川*/
+ private String prescription;
+ /**澶勬柟璧勮川鍚嶇О*/
+ private String prescriptionName;
+ /**鏄惁娉ㄥ皠鍓�*/
+ private Integer injection;
+ /**鍓傚瀷*/
+ private String dosageForm;
+ /**鍓傚瀷鍚嶇О*/
+ private String dosFormName;
+ /**鍓傞噺*/
+ private Integer dose;
+ /**鍓傞噺鍗曚綅*/
+ private String doseUnit;
+ /**鍓傞噺鍗曚綅鍚�*/
+ private String doseUnitName;
+ /**鍖呰鏁伴噺*/
+ private Integer packageNum;
+ /**灏忓寘瑁呭崟浣�*/
+ private String smallUnit;
+ /**灏忓寘瑁呭崟浣嶅悕*/
+ private String smaUnitName;
+ /**棰戞*/
+ private String frequency;
+ /**棰戞鍚�*/
+ private String frequencyName;
+ /**鎶楄弻鑽墿鏍囪瘑*/
+ private String antibioticsCode;
+ /**鎶楄弻鑽墿鍚�*/
+ private String antibioticsName;
+ /**鎶楄弻鑽墿鍒嗙骇绠＄悊*/
+ private String antibioticsGrade;
+ /**鎶楄弻鑽墿鍒嗙骇绠＄悊鍚�*/
+ private String antGradeName;
+ /**缁熻鍒嗙被*/
+ private String statisticSort;
+ /**缁熻鍒嗙被鍚�*/
+ private String staSortName;
+ /**鑽搧澶х被*/
+ private String bigTypeCode;
+ /**鑽搧澶х被鍚�*/
+ private String bigTypeName;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDt.java
new file mode 100644
index 0000000..f31457d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.consumables;
+
+import lombok.Data;
+
+/**
+ * 鍟嗗搧鍒楄〃瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class GoodsDt {
+ /**p-his鐨勫晢鍝佹爣璇�*/
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsListDt.java
new file mode 100644
index 0000000..e8b2474
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsListDt.java
@@ -0,0 +1,50 @@
+package com.hz.phis.dt.consumables;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍟嗗搧鍒楄〃瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class GoodsListDt {
+ /**p-his鐨勫晢鍝佹爣璇�*/
+ private String id;
+ /**鍟嗗搧鍚嶇О*/
+ private String name;
+ /**鍟嗗搧缂栧彿*/
+ private String serialNumber;
+ /**鍟嗗搧鏍囧噯缂栫爜*/
+ private String standardCode;
+ /**鍟嗗搧鏍囧噯鍚嶇О*/
+ private String standardName;
+ /**鍟嗗搧瑙勬牸*/
+ private String spec;
+ /**鍟嗗搧鍗曚綅*/
+ private String unitIdCode;
+ /**鍟嗗搧鍗曚綅鍚嶇О*/
+ private String unitName;
+ /**鍞环*/
+ private String price;
+ /**杩涗环*/
+ private String buyPrice;
+ /**鏈�楂橀浂鍞环鏍�*/
+ private String priceMax;
+ /**鏈�浣庨浂鍞环鏍�*/
+ private String priceMin;
+ /**浠锋牸鏍囩*/
+ private String priceTagCode;
+ /**浠锋牸鏍囩鍚嶇О*/
+ private String priceTagName;
+ /**绉戝鏍囪瘑*/
+ private String familiesRoomCode;
+ /**绉戝鍚嶇О*/
+ private String departmentName;
+ /**鍒犻櫎*/
+ private Integer isDel;
+
+ private List<GoodsDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsTypeListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsTypeListDt.java
new file mode 100644
index 0000000..203562d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsTypeListDt.java
@@ -0,0 +1,28 @@
+package com.hz.phis.dt.consumables;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍟嗗搧鍒嗙被鍒楄〃瀹炰綋
+ * @author fwq
+ *
+ * */
+@Data
+public class GoodsTypeListDt {
+ /**鍟嗗搧鍒嗙被鏍囪瘑*/
+ private String id;
+ /**鍟嗗搧鍒嗙被鍚嶇О*/
+ private String name;
+ /**鍟嗗搧鍒嗙被绛夌骇*/
+ private String level;
+ /**鍟嗗搧鍒嗙被鐖剁骇*/
+ private String parentId;
+ /**鍟嗗搧hisId*/
+ private String appId;
+ /**鍟嗗搧绫诲瀷service鏈嶅姟椤圭洰drug鑽搧goods鍟嗗搧*/
+ private String type;
+ /**瀛愮骇*/
+ private List children;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponAppointDt.java b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponAppointDt.java
new file mode 100644
index 0000000..8ec7520
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponAppointDt.java
@@ -0,0 +1,18 @@
+package com.hz.phis.dt.coupon;
+
+import lombok.Data;
+
+/**
+ * 鍚屾浼樻儬鍒告寚瀹氬垪琛ㄥ疄浣�
+ *
+ * @author fwq
+ */
+@Data
+public class CouponAppointDt {
+ /**绫诲瀷*/
+ private String type;
+ /**鍏辩敤鏍囪瘑*/
+ private String commonId;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponListDt.java
new file mode 100644
index 0000000..195ab40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponListDt.java
@@ -0,0 +1,82 @@
+package com.hz.phis.dt.coupon;
+
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鍚屾浼樻儬鍒稿垪琛ㄥ疄浣�
+ *
+ * @author fwq
+ */
+@Data
+public class CouponListDt {
+ /**鏍囪瘑*/
+ private String id;
+ /**浼樻儬鍒告爣棰�*/
+ private String title;
+ /**鎻忚堪*/
+ private String describeInfo;
+ /**鏄惁涓婃灦*/
+ private Integer isUp;
+ /**浣跨敤椤荤煡*/
+ private String useKnowInfo;
+ /**娉ㄦ剰浜嬮」*/
+ private String carefulInfo;
+ /**浣跨敤绫诲瀷*/
+ private Integer useType;
+ /**椤圭洰浣跨敤绫诲瀷锛�0鎸囧畾椤圭洰锛�1椤圭洰閫氱敤锛�*/
+ private Integer useProjectType;
+ /**鍟嗗搧浣跨敤绫诲瀷锛�2鎸囧畾鍟嗗搧锛�3鍟嗗搧閫氱敤锛�*/
+ private Integer useGoodsType;
+ /**鏄惁灞曠ず*/
+ private Integer isShow;
+ /**灞曠ず寮�濮嬫椂闂�*/
+ private String startShowTime;
+ /**灞曠ず缁撴潫鏃堕棿*/
+ private String endShowTime;
+ /**鏉′欢绫诲瀷*/
+ private Integer conditionType;
+ /**婊¤冻閲戦(鍏�)锛堟弧瓒宠閲戦渚垮彲鐢級*/
+ private BigDecimal amountSatisfied;
+ /**婊¤冻浠舵暟锛堟弧瓒宠鍟嗗搧浠舵暟渚垮彲鐢�,鏆傛椂棰勭暀锛�*/
+ private Integer itemNum;
+ /**浼樻儬绫诲瀷*/
+ private Integer type;
+ /**浼樻儬閲戦(鍏�)*/
+ private BigDecimal discountAmount;
+ /**浼樻儬鎶樻墸*/
+ private Double discountNum;
+ /**璁℃椂绫诲瀷*/
+ private Integer timeType ;
+ /**鍙犲姞鏃堕暱锛堝勾锛�*/
+ public Integer yearNum ;
+ /**鍙犲姞鏃堕暱锛堟湀锛�*/
+ public Integer monthNum ;
+ /**鍙犲姞鏃堕暱锛堟棩锛�*/
+ public Integer dayNum ;
+ /**鍙犲姞鏃堕暱锛堝皬鏃讹級*/
+ public Integer hoursNum ;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ private String startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ private String endTime;
+ /**鏄惁鑳戒娇鐢ㄥ鍊奸噾*/
+ private Integer isIncrement;
+ /**鎺掑簭*/
+ private Integer sortNum;
+ /**phis鏍囪瘑*/
+ private String hisId;
+ /**鍒犻櫎*/
+ private Integer isDel;
+ /**鍘熶环*/
+ private BigDecimal originalPrice;
+ /**鐜颁环*/
+ private BigDecimal price;
+ /**鎸囧畾*/
+ private List<CouponAppointDt> appointList;
+ /**闄愬埗淇℃伅*/
+ private LimitDt limitDt;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
new file mode 100644
index 0000000..d495388
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
@@ -0,0 +1,260 @@
+package com.hz.phis.dt.employee;
+
+import com.hz.phis.dt.BaseDt;
+
+/**
+ *
+ * 鍛樺伐
+ * Date:2021/8/4 17:35
+ */
+public class EmployeeDt extends BaseDt {
+
+ /**閿欒鐮�*/
+ private String code;
+ /**閿欒淇℃伅*/
+ private String msg;
+
+ /**寰俊unionId*/
+ private String unionId;
+ /**浼佷笟寰俊鍐呯敤鎴穒d*/
+ private String userId;
+ /**涓枃鍚嶇О*/
+ private String cnName;
+ /**鑻辨枃鍚嶇О*/
+ private String enName;
+ /**鑱旂郴鐢佃瘽*/
+ private String tel;
+ /**閭*/
+ private String email;
+ /**澶村儚*/
+ private String imgUrl;
+ /**his鎺ュ彛id*/
+ private String apiId;
+ /**鏄惁鍦ㄨ亴*/
+ private Integer isJob = NO;
+ /**鎬у埆0鐢�1濂�*/
+ private Integer gender = NO;
+ /**鍛樺伐缂栧彿*/
+ private String employeeNo;
+ /**鏈�鍚庝竴娆￠�夋嫨瑙掕壊id*/
+ private String roleId;
+ /**鏄惁鍚屾瑙掕壊*/
+ private Integer isSyncRole = YES;
+
+ /**sql璇彞杩斿洖浣跨敤瀛楁*/
+ private String shopId;
+ private String shopName;
+ private String shopHisId;
+ private String roleName;
+ private String roleStr;
+ private String roleTypeId;
+ private String adminRoleId;
+
+ public EmployeeDt() {
+ }
+
+
+ public String getUnionId() {
+ return unionId;
+ }
+
+ public void setUnionId(String unionId) {
+ this.unionId = unionId;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getCnName() {
+ return cnName;
+ }
+
+ public void setCnName(String cnName) {
+ this.cnName = cnName;
+ }
+
+ public String getEnName() {
+ return enName;
+ }
+
+ public void setEnName(String enName) {
+ this.enName = enName;
+ }
+
+ public String getTel() {
+ return tel;
+ }
+
+ public void setTel(String tel) {
+ this.tel = tel;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public String getApiId() {
+ return apiId;
+ }
+
+ public void setApiId(String apiId) {
+ this.apiId = apiId;
+ }
+
+ public Integer getIsJob() {
+ return isJob;
+ }
+
+ public void setIsJob(Integer isJob) {
+ this.isJob = isJob;
+ }
+
+ public Integer getGender() {
+ return gender;
+ }
+
+ public void setGender(Integer gender) {
+ this.gender = gender;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getRoleStr() {
+ return roleStr;
+ }
+
+ public void setRoleStr(String roleStr) {
+ this.roleStr = roleStr;
+ }
+
+ public String getEmployeeNo() {
+ return employeeNo;
+ }
+
+ public void setEmployeeNo(String employeeNo) {
+ this.employeeNo = employeeNo;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(String roleId) {
+ this.roleId = roleId;
+ }
+
+ public String getRoleName() {
+ return roleName;
+ }
+
+ public void setRoleName(String roleName) {
+ this.roleName = roleName;
+ }
+
+ public Integer getIsSyncRole() {
+ return isSyncRole;
+ }
+
+ public void setIsSyncRole(Integer isSyncRole) {
+ this.isSyncRole = isSyncRole;
+ }
+
+ public String getShopHisId() {
+ return shopHisId;
+ }
+
+ public void setShopHisId(String shopHisId) {
+ this.shopHisId = shopHisId;
+ }
+
+ public String getRoleTypeId() {
+ return roleTypeId;
+ }
+
+ public void setRoleTypeId(String roleTypeId) {
+ this.roleTypeId = roleTypeId;
+ }
+
+ public String getAdminRoleId() {
+ return adminRoleId;
+ }
+
+ public void setAdminRoleId(String adminRoleId) {
+ this.adminRoleId = adminRoleId;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ @Override
+ public String toString() {
+ return "Employee{" +
+ "code='" + code + '\'' +
+ ", msg='" + msg + '\'' +
+ ", unionId='" + unionId + '\'' +
+ ", userId='" + userId + '\'' +
+ ", cnName='" + cnName + '\'' +
+ ", enName='" + enName + '\'' +
+ ", tel='" + tel + '\'' +
+ ", email='" + email + '\'' +
+ ", imgUrl='" + imgUrl + '\'' +
+ ", apiId='" + apiId + '\'' +
+ ", isJob=" + isJob +
+ ", gender=" + gender +
+ ", employeeNo='" + employeeNo + '\'' +
+ ", roleId='" + roleId + '\'' +
+ ", isSyncRole=" + isSyncRole +
+ ", shopId='" + shopId + '\'' +
+ ", shopName='" + shopName + '\'' +
+ ", shopHisId='" + shopHisId + '\'' +
+ ", roleName='" + roleName + '\'' +
+ ", roleStr='" + roleStr + '\'' +
+ ", roleTypeId='" + roleTypeId + '\'' +
+ ", adminRoleId='" + adminRoleId + '\'' +
+ '}';
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeListDt.java
new file mode 100644
index 0000000..4f4fd2d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeListDt.java
@@ -0,0 +1,112 @@
+package com.hz.phis.dt.employee;
+
+import com.hz.phis.dt.BaseDt;
+
+import java.util.List;
+
+/**
+ *
+ * 鍛樺伐
+ * Date:2021/8/4 17:35
+ */
+public class EmployeeListDt extends BaseDt {
+
+ /**閿欒鐮�*/
+ private String code;
+ /**閿欒淇℃伅*/
+ private String msg;
+
+
+ private Integer total;
+ private Integer pages;
+ private Integer pageNum;
+ private Integer pageSize;
+ private Integer isLastPage;
+ private List<EmployeeDt> employeeList;
+
+
+ public EmployeeListDt() {
+ }
+
+
+ //////////////////////////////////////////////////////////////////////////////
+
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public Integer getTotal() {
+ return total;
+ }
+
+ public void setTotal(Integer total) {
+ this.total = total;
+ }
+
+ public Integer getPages() {
+ return pages;
+ }
+
+ public void setPages(Integer pages) {
+ this.pages = pages;
+ }
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getIsLastPage() {
+ return isLastPage;
+ }
+
+ public void setIsLastPage(Integer isLastPage) {
+ this.isLastPage = isLastPage;
+ }
+
+ public List<EmployeeDt> getEmployeeList() {
+ return employeeList;
+ }
+
+ public void setEmployeeList(List<EmployeeDt> employeeList) {
+ this.employeeList = employeeList;
+ }
+
+ @Override
+ public String toString() {
+ return "EmployeeList{" +
+ "code='" + code + '\'' +
+ ", msg='" + msg + '\'' +
+ ", total=" + total +
+ ", pages=" + pages +
+ ", pageNum=" + pageNum +
+ ", pageSize=" + pageSize +
+ ", isLastPage=" + isLastPage +
+ ", employeeList=" + employeeList +
+ '}';
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateDt.java b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateDt.java
new file mode 100644
index 0000000..94e8055
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateDt.java
@@ -0,0 +1,40 @@
+package com.hz.phis.dt.employee;
+
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+/**
+ * 鍚屾鍛樺伐瀹炰綋
+ * */
+@Data
+public class EmployeeUpdateDt extends BaseDt {
+ /**寰俊unionId*/
+ private String unionId;
+ /**浼佷笟寰俊鍐呯敤鎴穒d*/
+ private String userId;
+ /**涓枃鍚嶇О*/
+ private String cnName;
+ /**鑻辨枃鍚嶇О*/
+ private String enName;
+ /**鑱旂郴鐢佃瘽*/
+ private String tel;
+ /**閭*/
+ private String email;
+ /**澶村儚*/
+ private String imgUrl;
+ /**his鎺ュ彛id*/
+ private String apiId;
+ /**鏄惁鍦ㄨ亴*/
+ private Integer isJob;
+ /**鎬у埆0鐢�1濂�*/
+ private Integer gender;
+ /**鍛樺伐缂栧彿*/
+ private String employeeNo;
+ /**鏈�鍚庝竴娆￠�夋嫨瑙掕壊id*/
+ private String roleId;
+ /**鏄惁鍚屾瑙掕壊*/
+ private Integer isSyncRole;
+ /**roleUniqueStr鏄痶mk_adviser鐨勮鑹茶〃鏍囪瘑*/
+ private String tmkId;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateListDt.java
new file mode 100644
index 0000000..312a236
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeUpdateListDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.employee;
+
+import com.hz.phis.dt.employee.EmployeeUpdateDt;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍚屾鍛樺伐鍒楄〃瀹炰綋
+ * */
+@Data
+public class EmployeeUpdateListDt {
+ private List<EmployeeUpdateDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitBirthdayDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitBirthdayDt.java
new file mode 100644
index 0000000..fcfd60b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitBirthdayDt.java
@@ -0,0 +1,38 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+/**
+ * 鐢熸棩鏃ユ湡闄愬埗
+ * @author fwq
+ */
+@Data
+public class LimitBirthdayDt {
+ /**闄愬埗鏍囪瘑*/
+ private String id;
+ /**闄愬埗绫诲瀷*/
+ private Integer limitType;
+ /**骞撮檺鍒�*/
+ private String year;
+ /**鏈堥檺鍒�*/
+ private String month;
+ /**鏃ラ檺鍒�*/
+ private String day;
+ /**闄愯喘鏁伴噺*/
+ private Integer limitNum;
+ /**闄愬埗澶囨敞*/
+ private String remarks;
+ /**闄愬埗鎬绘爣璇�*/
+ private String limitTotalId;
+
+ /**鐢熸棩-骞撮檺鍒�*/
+ public static final int LIMIT_YEAR = 0;
+ /**鐢熸棩-鏈堥檺鍒�*/
+ public static final int LIMIT_MONTH = 1;
+ /**鐢熸棩-鏃ラ檺鍒�*/
+ public static final int LIMIT_DAY = 2;
+ /**缁勫悎闄愬埗*/
+ public static final int LIMIT_MIXED = 3;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitDt.java
new file mode 100644
index 0000000..6a983af
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitDt.java
@@ -0,0 +1,23 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 闄愬埗
+ * @author fwq
+ */
+@Data
+public class LimitDt {
+ /**鎬婚檺鍒�*/
+ private LimitTotalDt limitTotal;
+ /**骞冲彴闄愬埗*/
+ private List<LimitPlatformDt> platformLimitList;
+ /**浼氬憳闄愬埗*/
+ private List<LimitMemberDt> memberLimitList;
+ /**鐢熸棩鏃ユ湡闄愬埗*/
+ private List<LimitBirthdayDt> birthdayLimitList;
+ /**鍏朵粬闄愬埗*/
+ private List<LimitOtherDt> otherLimitList;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitListDt.java
new file mode 100644
index 0000000..6348e96
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitListDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 闄愬埗
+ * @author fwq
+ */
+@Data
+public class LimitListDt {
+ private List<LimitUpdateDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitMemberDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitMemberDt.java
new file mode 100644
index 0000000..7d453f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitMemberDt.java
@@ -0,0 +1,32 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+/**
+ * 浼氬憳闄愬埗
+ * @author fwq
+ * */
+@Data
+public class LimitMemberDt {
+ /**闄愬埗鏍囪瘑*/
+ private String id;
+ /**闄愬埗缂栫爜*/
+ private String code;
+ /**绫诲瀷*/
+ private Integer type;
+ /**澶栭敭id*/
+ private String foreignKey;
+ /**浼氬憳鏍囪瘑*/
+ private String memberId;
+ /**闄愬埗鎬绘爣璇�*/
+ private String limitTotalId;
+
+ /**绫诲瀷-鍗￠」*/
+ public static final Integer LIMIT_CARD_ITEM = 0;
+ /**绫诲瀷-淇冮攢*/
+ public static final Integer LIMIT_PROMOTION = 1;
+ /**绫诲瀷-椤圭洰*/
+ public static final Integer LIMIT_PROJECT = 2;
+ /**绫诲瀷-鍟嗗搧(鑰楁潗)*/
+ public static final Integer LIMIT_CONSUMABLE = 3;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitOtherDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitOtherDt.java
new file mode 100644
index 0000000..f0a9192
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitOtherDt.java
@@ -0,0 +1,33 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+/**
+ * 鍏朵粬闄愬埗
+ * @author fwq
+ */
+
+@Data
+public class LimitOtherDt {
+ /**闄愬埗鏍囪瘑*/
+ private String id;
+ /**鍏叡鏍囪瘑(鏄熷骇/闂ㄥ簵/鍏朵粬)*/
+ private String commonId;
+ /**鍏叡鍚嶇О*/
+ private String commonName;
+ /**绫诲瀷*/
+ private Integer type;
+ /**闄愬埗鎬绘爣璇�*/
+ private String limitTotalId;
+
+ /**鏄熷骇*/
+ public static final Integer TYPE_STAR = 0;
+ /**闂ㄥ簵*/
+ public static final Integer TYPE_SHOP = 1;
+ /**娓犻亾*/
+ public static final Integer TYPE_CHANNEL = 2;
+ /**鏍囩*/
+ public static final Integer TYPE_LABEL = 3;
+ /**鏀粯鏂瑰紡*/
+ public static final Integer TYPE_PAY_METHOD = 4;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitPlatformDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitPlatformDt.java
new file mode 100644
index 0000000..c822f3e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitPlatformDt.java
@@ -0,0 +1,29 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+/**
+ * 骞冲彴闄愬埗
+ * @author fwq
+ */
+@Data
+public class LimitPlatformDt {
+ /**闄愬埗鏍囪瘑*/
+ private String id;
+ /**缂栫爜*/
+ private String code;
+ /**骞冲彴鍚嶇О*/
+ private String name;
+ /**骞冲彴搴旂敤appId*/
+ private String appId;
+ /**绫诲瀷*/
+ private Integer type;
+ /**闄愬埗鎬绘爣璇�*/
+ private String limitTotalId;
+
+ /**绫诲瀷-鎬诲钩鍙�*/
+ public static final Integer TYPE_PLATFORM_ALL = 0;
+ /**绫诲瀷-鍏朵粬骞冲彴*/
+ public static final Integer TYPE_PLATFORM_OTHER = 1;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
new file mode 100644
index 0000000..21d9135
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
@@ -0,0 +1,58 @@
+package com.hz.phis.dt.limit;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 鎬婚檺鍒�
+ * @author fwq
+ */
+@Data
+public class LimitTotalDt {
+ /**闄愬埗鏍囪瘑*/
+ private String id;
+ /**闄愬埗缂栫爜*/
+ private String code;
+ /**绫诲瀷*/
+ private int type;
+ /**澶栭敭id(鍗￠」/淇冮攢/椤圭洰鏍囪瘑)*/
+ private String foreignKey;
+ /**闄愬埗鏁伴噺*/
+ private Integer limitNum;
+ /**闄愬埗鎬绘暟閲�*/
+ private Integer limitSumNum;
+ /**瀹㈡埛绫诲埆鏍囪瘑*/
+ private String userTypeId;
+ /**瀹㈡埛绫诲埆鍚嶇О*/
+ private String userTypeName;
+ /**鍙戝竷鑼冨洿(PlatformLimit:code)*/
+ private String isUpPlatform;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date endTime;
+ /**鏈�鍚庝竴娆′笅鍗曞紑濮嬫椂闂�*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date lastStartTime;
+ /**鏈�鍚庝竴娆′笅鍗曠粨鏉熸椂闂�*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date lastEndTime;
+
+ /**绫诲瀷-鍗￠」*/
+ public static final Integer LIMIT_CARD_ITEM = 0;
+ /**绫诲瀷-淇冮攢*/
+ public static final Integer LIMIT_PROMOTION = 1;
+ /**绫诲瀷-椤圭洰*/
+ public static final Integer LIMIT_PROJECT = 2;
+ /**绫诲瀷-鍟嗗搧(鑰楁潗)*/
+ public static final Integer LIMIT_CONSUMABLE = 3;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitUpdateDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitUpdateDt.java
new file mode 100644
index 0000000..58cf106
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitUpdateDt.java
@@ -0,0 +1,27 @@
+package com.hz.phis.dt.limit;
+
+import lombok.Data;
+
+/**
+ * 闄愬埗
+ * @author fwq
+ */
+@Data
+public class LimitUpdateDt {
+ private String id;
+ private String foreignKey;
+ private Integer type;
+
+ /**绫诲瀷-鍗￠」*/
+ public static final Integer LIMIT_CARD_ITEM = 0;
+ /**绫诲瀷-淇冮攢*/
+ public static final Integer LIMIT_PROMOTION = 1;
+ /**绫诲瀷-椤圭洰*/
+ public static final Integer LIMIT_PROJECT = 2;
+ /**绫诲瀷-鍟嗗搧(鑰楁潗)*/
+ public static final Integer LIMIT_CONSUMABLE = 3;
+ /**绫诲瀷-SPU*/
+ public static final Integer LIMIT_SPU = 4;
+ /**绫诲瀷-娲诲姩瑙勫垯绫�*/
+ public static final Integer LIMIT_ACTIVITY = 5;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/member/MemberLevelDt.java b/phis-feign/src/main/java/com/hz/phis/dt/member/MemberLevelDt.java
new file mode 100644
index 0000000..d549fdc
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/member/MemberLevelDt.java
@@ -0,0 +1,24 @@
+package com.hz.phis.dt.member;
+
+
+
+public class MemberLevelDt {
+ private String id;
+ private String name;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/member/MemberListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/member/MemberListDt.java
new file mode 100644
index 0000000..4ff983e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/member/MemberListDt.java
@@ -0,0 +1,17 @@
+package com.hz.phis.dt.member;
+
+import java.util.List;
+
+
+public class MemberListDt{
+
+ private List<MemberLevelDt> list;
+
+ public List<MemberLevelDt> getList() {
+ return list;
+ }
+
+ public void setList(List<MemberLevelDt> list) {
+ this.list = list;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDeLimitBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDeLimitBo.java
new file mode 100644
index 0000000..4c3393c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDeLimitBo.java
@@ -0,0 +1,17 @@
+package com.hz.phis.dt.project;
+
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+
+/**
+ * 椤圭洰璇︽儏闄愬埗瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectDeLimitBo{
+ /**椤圭洰淇℃伅*/
+ private ProjectDetailBo projectDetail;
+ /**闄愬埗淇℃伅*/
+ private LimitDt limitBo;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java
new file mode 100644
index 0000000..f9ac36b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java
@@ -0,0 +1,144 @@
+package com.hz.phis.dt.project;
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 椤圭洰璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectDetailBo extends BaseDt {
+ /**绫诲瀷0sku 1spu*/
+ private Integer type;
+ /**椤圭洰-涓婁笅鏋�*/
+ private Integer isUp;
+ /**鍘熶环*/
+ private BigDecimal originalPrice;
+ /**閿�鍞崟浠�*/
+ private BigDecimal price;
+ /**娌荤枟鏃堕暱锛屼互绉掍负瀛樺偍鍗曚綅*/
+ private Integer useDuration ;
+ /**闂撮殧鏃堕棿锛屼互绉掍负瀛樺偍鍗曚綅*/
+ private Integer intervalDuration;
+ /**瑙勬牸*/
+ private List<ProjectSpecsBo> projectSpecsBoList;
+ /**sku淇℃伅*/
+ private List<String> skuIdList;
+ /**瑙勬牸*/
+ private String specification;
+ /**鍏朵粬瑙勬牸*/
+ private String specOther;
+ /**椤圭洰绫诲瀷鏍囪瘑*/
+ private String projectTypeId;
+ /**椤圭洰绫诲瀷鍚嶇О*/
+ private String projectTypeName;
+ /**椤圭洰鍚嶇О*/
+ private String name;
+ /**椤哄簭鍙�*/
+ private Integer orderNum;
+ /**澶囨敞*/
+ private String remark;
+ /**鎺ュ彛id*/
+ private String apiId;
+ /**鎺ュ彛code*/
+ private String apiCode;
+ /**his椤圭洰鍚嶇О*/
+ private String hisName;
+ /**his瑙勬牸*/
+ private String hisSpec;
+ /**鏈墠鏃堕棿锛屼互绉掍负瀛樺偍鍗曚綅*/
+ private Integer readyDuration;
+ /**椤圭洰鍗曚綅*/
+ private String unit;
+ /**椤圭洰绫诲埆(0:鍖荤編锛�1:鏄惁鐢熺編)*/
+ private Integer isLifeBeauty;
+ /**鏁烽夯鏃堕棿锛屼互绉掍负瀛樺偍鍗曚綅*/
+ private Integer palsyDuration;
+ /**鏄惁澶ч」鐩�*/
+ private Integer isBigProject;
+ /**浼戞伅闂撮殧锛屾牸寮忥細10-20|40-50*/
+ private String restInterval;
+ /**鏄惁鍏宠仈璁惧*/
+ private Integer isDevice;
+ /**鑻辨枃鍚嶇О*/
+ private String englishName;
+ /**绫诲埆*/
+ private String category;
+ /**鐤楃▼娆℃暟*/
+ private String courseCount;
+ /**鏄惁鍙墽琛�*/
+ private boolean executable;
+ /**缂栧彿*/
+ private String coding;
+ /**鎼滅储鎷奸煶*/
+ private String searchPinyin;
+ /**鏍囧噯缂栫爜*/
+ private String standardCode;
+ /**鏍囧噯鍚嶇О*/
+ private String standardName;
+ /**鐙韩鏃堕暱*/
+ private Integer exclusive;
+ /**鍏变韩鏃堕暱*/
+ private Integer sharingTime;
+ /**鏄惁鎴愪氦*/
+ private Integer isMakeADeal;
+ /**鏄惁鍖荤枟椤圭洰*/
+ private Integer isMedicalIitems;
+ /**鏄惁缁勫悎椤圭洰*/
+ private Integer isCombinedProject;
+ /**鏄惁璧犻�佺Н鍒�*/
+ private Integer isGiftPoints;
+ /**鏄惁鍙墽琛�*/
+ private Integer isExecutable;
+ /**鏄惁鐤楃▼椤圭洰*/
+ private Integer isTreatmentItems;
+ /**鐤楃▼椤圭洰娆℃暟*/
+ private Integer treatmentItemsNum;
+ /**榛樿娓犻亾鎻愭垚姣斾緥鏄惁鍚敤*/
+ private Integer isDefaultCommission;
+ /**榛樿娓犻亾鎻愭垚姣斾緥鐧惧垎鏁�*/
+ private Integer defaultCommission;
+ /**鏍囩*/
+ private String tag;
+ /**椤圭洰鎬绘爣璇�*/
+ private String projectGeneralId;
+ /**椤圭洰鏍囪瘑*/
+ private String projectId;
+ /**韬綋閮ㄤ綅,鏈骇鏍囪瘑*/
+ private String bodyPartId;
+ /**韬綋閮ㄤ綅鍚嶇О*/
+ private String bodyPartName;
+ /**涓氭��*/
+ private String format;
+ /**鍖荤敓璧勮川*/
+ private String doctorQualification;
+ /**鎵ц璧勮川*/
+ private String executiveQualificationCode;
+ /**鎵ц璧勮川鍚嶇О*/
+ private String executiveQualificationName;
+ /**鏀跺叆璁″叆*/
+ private String incomeIncludedCode;
+ /**鏀跺叆璁″叆鍚嶇О*/
+ private String incomeIncludedName;
+ /**鏀跺叆涓讳綋*/
+ private String incomeSubjectCode;
+ /**鏀跺叆涓讳綋鍚嶇О*/
+ private String incomeSubjectName;
+ /**绉戝鍚嶇О*/
+ private String departmentName;
+ /**绉戝缂栫爜*/
+ private String departmentCode;
+ /**鍙敭鑼冨洿*/
+ private String availableForSaleCode;
+ /**鍙敭鑼冨洿鍚嶇О*/
+ private String availableForSaleName;
+ /**浠锋牸鏍囩*/
+ private String priceTagCode;
+ /**浠锋牸鏍囩鍚嶇О*/
+ private String priceTagName;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListBo.java
new file mode 100644
index 0000000..238a16f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListBo.java
@@ -0,0 +1,46 @@
+package com.hz.phis.dt.project;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 椤圭洰鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectListBo {
+ /**p-his鐨勯」鐩爣璇�*/
+ private String id;
+ /**缂栧彿*/
+ private String coding;
+ /**椤圭洰鍚嶇О*/
+ private String name;
+ /**閿�鍞崟浠�*/
+ private BigDecimal price;
+ /**鍘熶环*/
+ private BigDecimal originalPrice;
+ /**椤圭洰鍒嗙被鏍囪瘑*/
+ private String projectTypeId;
+ /**椤圭洰鍒嗙被鍚嶇О*/
+ private String projectTypeName;
+ /**椤圭洰瑙勬牸*/
+ private String specification;
+ /**椤圭洰鍏朵粬瑙勬牸*/
+ private String specOther;
+ /**椤圭洰鍗曚綅*/
+ private String unit;
+ /**绫诲埆*/
+ private String category;
+ /**鐤楃▼娆℃暟*/
+ private String courseCount;
+ /**鑻辨枃鍚嶇О*/
+ private String englishName;
+ /**his椤圭洰鍚嶇О*/
+ private String hisName;
+ /**his瑙勬牸*/
+ private String hisSpec;
+ /**鍒犻櫎*/
+ private Integer isDel;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListDt.java
new file mode 100644
index 0000000..b4b7538
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectListDt.java
@@ -0,0 +1,16 @@
+package com.hz.phis.dt.project;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 椤圭洰鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectListDt {
+ /**p-his鐨勯」鐩�*/
+ private List<ProjectUpdateDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsBo.java
new file mode 100644
index 0000000..ebc44b9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsBo.java
@@ -0,0 +1,25 @@
+package com.hz.phis.dt.project;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 椤圭洰瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectSpecsBo {
+ /**瑙勬牸鏍囪瘑*/
+ private String id;
+ /**瑙勬牸缂栧彿*/
+ private String coding;
+ /**瑙勬牸鍚�*/
+ private String specName;
+ /**瑙勬牸涓婁笅鏋�*/
+ private Integer isUp;
+ /**瑙勬牸鍊奸泦鍚�*/
+ private List<ProjectSpecsValueBo> projectSpecsValueList;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsValueBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsValueBo.java
new file mode 100644
index 0000000..db92165
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectSpecsValueBo.java
@@ -0,0 +1,23 @@
+package com.hz.phis.dt.project;
+
+
+import lombok.Data;
+
+/**
+ * 椤圭洰瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectSpecsValueBo {
+ /**瑙勬牸鍊兼爣璇�*/
+ private String id;
+ /**瑙勬牸缂栧彿*/
+ private String coding;
+ /**瑙勬牸鍊煎悕*/
+ private String specValueName;
+ /**瑙勬牸鍊间笂涓嬫灦*/
+ private Integer isUp;
+ /**瑙勬牸鏍囪瘑*/
+ private String specificationId;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectTypeListBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectTypeListBo.java
new file mode 100644
index 0000000..1fbb633
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectTypeListBo.java
@@ -0,0 +1,30 @@
+package com.hz.phis.dt.project;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 椤圭洰鍒嗙被鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectTypeListBo {
+ /**椤圭洰鍒嗙被鏍囪瘑*/
+ private String id;
+ /**椤圭洰鍒嗙被鍚嶇О*/
+ private String name;
+ /**绛夌骇*/
+ private Integer level;
+ /**涓嶈兘棰勭害鐨勬槦鏈熷1|2锛�1鏄熸湡澶╋紝2鏄熸湡涓�*/
+ private String noApptDay;
+ /**鐖剁骇*/
+ private String parentId;
+ /**鎺ュ彛id*/
+ private String apiId;
+ /**鎺ュ彛code*/
+ private String apiCode;
+ /**瀛愮骇*/
+ private List children;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectUpdateDt.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectUpdateDt.java
new file mode 100644
index 0000000..d8253d9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectUpdateDt.java
@@ -0,0 +1,14 @@
+package com.hz.phis.dt.project;
+
+import lombok.Data;
+
+/**
+ * 椤圭洰鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class ProjectUpdateDt {
+ /**p-his鐨勯」鐩爣璇�*/
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDeLimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDeLimitDt.java
new file mode 100644
index 0000000..085e755
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDeLimitDt.java
@@ -0,0 +1,20 @@
+package com.hz.phis.dt.promotion;
+
+
+import com.hz.phis.dt.limit.LimitDt;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 淇冮攢璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class PromotionDeLimitDt extends PromotionListDt {
+ /**淇冮攢淇℃伅*/
+ private List<PromotionDetailDt> infoList;
+ /**闄愬埗淇℃伅*/
+ private LimitDt limitBo;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDetailDt.java
new file mode 100644
index 0000000..e70da90
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDetailDt.java
@@ -0,0 +1,44 @@
+package com.hz.phis.dt.promotion;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 淇冮攢璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class PromotionDetailDt {
+ /**缂栧彿(椤圭洰/鍟嗗搧/澧炲�奸噾/鍌ㄥ�奸噾/绉垎)*/
+ private String commonCode;
+ /**(project椤圭洰锛宺etail鍟嗗搧锛宨ncrement澧炲�奸噾锛宻tored鍌ㄥ�奸噾锛宨ntegral绉垎锛岄」鐩垎绫籶roject_type锛宺etail_type鍟嗗搧鍒嗙被)*/
+ private String type;
+ /**鍏叡鏍囪瘑(椤圭洰/鍟嗗搧/澧炲�奸噾(PaymentMethod)/鍌ㄥ�奸噾(PaymentMethod)/绉垎(PaymentMethod))*/
+ private String commonId;
+ /**鍏叡鍚嶇О*/
+ private String commonName;
+ /**瑙勬牸*/
+ private String specJson;
+ /**鐤楃▼椤圭洰娆℃暟(ProjectGeneral)*/
+ private Integer treatmentItemsNum;
+ /**鍗曚环*/
+ private BigDecimal price;
+ /**鏁伴噺*/
+ private Integer num;
+ /**鎬讳环(鍗曚环*鏁伴噺)*/
+ private BigDecimal total;
+ /**鎶樻墸鍗曚环*/
+ private BigDecimal discountPrice;
+ /**鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
+ private BigDecimal discount;
+ /**鎶樺悗浠�*/
+ private BigDecimal discountAfterPrice;
+ /**鏄惁璧犻��*/
+ private Integer isGiving;
+ /**淇冮攢鏍囪瘑*/
+ private String promotionId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
new file mode 100644
index 0000000..8ec30bd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
@@ -0,0 +1,15 @@
+package com.hz.phis.dt.promotion;
+
+
+import lombok.Data;
+
+/**
+ * 淇冮攢璇︽儏瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class PromotionDt {
+ private PromotionDeLimitDt promotion;
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionListDt.java
new file mode 100644
index 0000000..f380ebf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionListDt.java
@@ -0,0 +1,49 @@
+package com.hz.phis.dt.promotion;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 淇冮攢鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+@Data
+public class PromotionListDt {
+ /**p-his鐨勪績閿�鏍囪瘑*/
+ private String id;
+ /**涓婁笅鏋�*/
+ private Integer isUp;
+ /**缂栧彿*/
+ private String code;
+ /**淇冮攢鍚�*/
+ private String name;
+ /**绫诲瀷new_user鏂板old_user鑰佸*/
+ private String type;
+ /**鐘舵�侊細not_start鏈紑濮嬶紝in_progress姝ｅ湪杩涜涓紝stop_start宸茬粨鏉燂紝stop_pause鏆傚仠*/
+ private String status;
+ /**鎺ュ彛id*/
+ private String apiId;
+ /**淇冮攢鎬婚噾棰�*/
+ private BigDecimal total;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**闂ㄥ簵鍚嶇О*/
+ private String shopName;
+ /**鏈夋晥寮�濮嬫椂闂�*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private String startTime;
+ /**鏈夋晥缁撴潫鏃堕棿*/
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private String endTime;
+ /**鍒犻櫎*/
+ private Integer isDel;
+
+ private List<PromotionDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
new file mode 100644
index 0000000..eb07259
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
@@ -0,0 +1,201 @@
+package com.hz.phis.dt.shop;
+
+import com.hz.phis.dt.BaseDt;
+
+/**
+ * 鍚屾闂ㄥ簵鍒楄〃瀹炰綋
+ *
+ * @author fwq
+ */
+public class ShopDt extends BaseDt {
+ /**缂栧彿*/
+ private String code;
+ /**鍚嶇О*/
+ private String name;
+ /**鎵�灞炵埗绾ч儴闂ㄦ爣璇�(Department)*/
+ private String departmentId;
+ /**浼佷笟寰俊閮ㄩ棬id*/
+ private Integer corpMpDepId;
+ /**鏈�澶ч绾︽暟閲�*/
+ private Integer maxAppNum;
+ /**鏈�澶ц浆鐤楁暟閲�*/
+ private Integer maxSwitchNum;
+ /**鏄惁鍚敤*/
+ private Integer isUp;
+ /**宸ヤ綔鏃堕棿濡�09:00-12:00|14:00-16:00*/
+ private String workTime;
+ /**鍦板潃-鐪�*/
+ private String province;
+ /**鍦板潃-甯�*/
+ private String city;
+ /**鍦板潃-鍖�*/
+ private String area;
+ /**鍦板潃璇︾粏*/
+ private String addr;
+ /**棰滆壊瀛楃涓�*/
+ private String colorStr;
+ /**鍖荤敓浼戞伅鏃堕棿*/
+ private String doctorRelaxTime;
+ /**椹捐溅璺嚎*/
+ private String carWay;
+ /**鍦伴搧璺緞*/
+ private String subWay;
+ /**api绯荤粺鐨刬d*/
+ private String apiId;
+ /**鐢熺編棰勭害闄愬埗鏁伴噺*/
+ private Integer shengMeiNum;
+ /**鍚屼竴鏃堕棿娈靛鎴锋暟*/
+ private Integer sameTimeCustomerNum;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDepartmentId() {
+ return departmentId;
+ }
+
+ public void setDepartmentId(String departmentId) {
+ this.departmentId = departmentId;
+ }
+
+ public Integer getCorpMpDepId() {
+ return corpMpDepId;
+ }
+
+ public void setCorpMpDepId(Integer corpMpDepId) {
+ this.corpMpDepId = corpMpDepId;
+ }
+
+ public Integer getMaxAppNum() {
+ return maxAppNum;
+ }
+
+ public void setMaxAppNum(Integer maxAppNum) {
+ this.maxAppNum = maxAppNum;
+ }
+
+ public Integer getMaxSwitchNum() {
+ return maxSwitchNum;
+ }
+
+ public void setMaxSwitchNum(Integer maxSwitchNum) {
+ this.maxSwitchNum = maxSwitchNum;
+ }
+
+ public Integer getIsUp() {
+ return isUp;
+ }
+
+ public void setIsUp(Integer isUp) {
+ this.isUp = isUp;
+ }
+
+ public String getWorkTime() {
+ return workTime;
+ }
+
+ public void setWorkTime(String workTime) {
+ this.workTime = workTime;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public String getAddr() {
+ return addr;
+ }
+
+ public void setAddr(String addr) {
+ this.addr = addr;
+ }
+
+ public String getColorStr() {
+ return colorStr;
+ }
+
+ public void setColorStr(String colorStr) {
+ this.colorStr = colorStr;
+ }
+
+ public String getDoctorRelaxTime() {
+ return doctorRelaxTime;
+ }
+
+ public void setDoctorRelaxTime(String doctorRelaxTime) {
+ this.doctorRelaxTime = doctorRelaxTime;
+ }
+
+ public String getCarWay() {
+ return carWay;
+ }
+
+ public void setCarWay(String carWay) {
+ this.carWay = carWay;
+ }
+
+ public String getSubWay() {
+ return subWay;
+ }
+
+ public void setSubWay(String subWay) {
+ this.subWay = subWay;
+ }
+
+ public String getApiId() {
+ return apiId;
+ }
+
+ public void setApiId(String apiId) {
+ this.apiId = apiId;
+ }
+
+ public Integer getShengMeiNum() {
+ return shengMeiNum;
+ }
+
+ public void setShengMeiNum(Integer shengMeiNum) {
+ this.shengMeiNum = shengMeiNum;
+ }
+
+ public Integer getSameTimeCustomerNum() {
+ return sameTimeCustomerNum;
+ }
+
+ public void setSameTimeCustomerNum(Integer sameTimeCustomerNum) {
+ this.sameTimeCustomerNum = sameTimeCustomerNum;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopListDt.java
new file mode 100644
index 0000000..152f467
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopListDt.java
@@ -0,0 +1,21 @@
+package com.hz.phis.dt.shop;
+
+
+import java.util.List;
+
+/**
+ * 鍚屾闂ㄥ簵鍒楄〃
+ *
+ * @author fwq
+ */
+public class ShopListDt {
+ private List<ShopDt> list;
+
+ public List<ShopDt> getList() {
+ return list;
+ }
+
+ public void setList(List<ShopDt> list) {
+ this.list = list;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceDt.java b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceDt.java
new file mode 100644
index 0000000..217575f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceDt.java
@@ -0,0 +1,58 @@
+package com.hz.phis.dt.shop;
+
+import java.math.BigDecimal;
+
+/**
+ * 闂ㄥ簵浠锋牸
+ * @author fwq
+ */
+public class ShopPriceDt {
+
+ private int type;
+ private String shopId;
+ private String commonId;
+ private BigDecimal price;
+
+ public int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getCommonId() {
+ return commonId;
+ }
+
+ public void setCommonId(String commonId) {
+ this.commonId = commonId;
+ }
+
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ public void setPrice(BigDecimal price) {
+ this.price = price;
+ }
+
+ /**绫诲瀷-鍗￠」*/
+ public static final Integer LIMIT_CARD_ITEM = 0;
+ /**绫诲瀷-淇冮攢*/
+ public static final Integer LIMIT_PROMOTION = 1;
+ /**绫诲瀷-椤圭洰*/
+ public static final Integer LIMIT_PROJECT = 2;
+ /**绫诲瀷-鍟嗗搧(鑰楁潗)*/
+ public static final Integer LIMIT_CONSUMABLE = 3;
+ /**绫诲瀷-SPU*/
+ public static final Integer LIMIT_SPU = 4;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceListDt.java b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceListDt.java
new file mode 100644
index 0000000..9591977
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopPriceListDt.java
@@ -0,0 +1,15 @@
+package com.hz.phis.dt.shop;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 闂ㄥ簵浠锋牸
+ * @author fwq
+ */
+@Data
+public class ShopPriceListDt {
+ /**闂ㄥ簵浠锋牸*/
+ private List<ShopPriceDt> list;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserProItemDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserProItemDt.java
new file mode 100644
index 0000000..7cf6bb8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserProItemDt.java
@@ -0,0 +1,75 @@
+package com.hz.phis.dt.user;
+
+
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鐢ㄦ埛鎷ユ湁瀛愰」鐩�
+ * @author fwq
+ */
+@Data
+public class UserProItemDt extends BaseDt {
+ /**璁㈠崟鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鎬绘敮浠橀噾棰�*/
+ private BigDecimal actualTotal;
+ /**鍘熶环*/
+ private BigDecimal oriPrice;
+ /**鐜颁环*/
+ private BigDecimal curPrice;
+ /**璐拱鏁伴噺*/
+ private Integer buyNum;
+ /**鎬绘鏁帮紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer usedTotal;
+ /**鏈娇鐢ㄦ鏁帮紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer notUsedNum;
+ /**宸蹭娇鐢ㄦ鏁帮紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer usedNum;
+ /**宸茶繃鏈熸鏁帮紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer overdueNum;
+ /**杞禒娆℃暟锛堥」鐩鏁�/鍗￠」娆℃暟锛�*/
+ private Integer transferNum;
+ /**宸插彇娑堟鏁帮紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer cancelNum;
+ /**宸叉崲璐紙椤圭洰娆℃暟/鍗￠」娆℃暟锛�*/
+ private Integer inBygNum;
+ /**鎵�灞為棬搴梚d*/
+ private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
+ /**绉戝缂栫爜(瀛楀吀涓幏鍙�)*/
+ private String departmentCode;
+ /**绉戝鍚嶇О*/
+ private String departmentName;
+ /**鏈夋晥鐘舵��(UserProjectConstants)*/
+ private Integer effectiveStatus;
+ /**鏄惁鏈夋晥鏃堕棿闄愬埗:0鍚�1鏄�*/
+ private Integer timeLimit;
+ /**鏈夋晥鏃堕棿锛堝紑濮嬶級*/
+ private Date limitStartTime;
+ /**鏈夋晥鏃堕棿锛堢粨鏉燂級*/
+ private Date limitEndTime;
+ /**鏉ユ簮绫诲瀷(OrderSourceConstans)*/
+ private String commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String commonId;
+ /**鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛�*/
+ private Integer usedOne;
+ /**韬綋閮ㄤ綅鏍囪瘑*/
+ private String bodyPartsId;
+ /**韬綋閮ㄤ綅鍚嶇О*/
+ private String bodyPartsName;
+ /**鐢ㄦ埛椤圭洰id锛圲serProject锛�*/
+ private String userProjectId;
+ /**鐢ㄦ埛Id*/
+ private String userId;
+ /**璁㈠崟ItemId*/
+ private String orderItemId;
+ /**鎵ц鏉＄洰id*/
+ private String itemId;
+}
--
Gitblit v1.8.0