From f5bce1128a4b9c8ccc0eb636747d060ce93e3135 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 22 七月 2022 16:31:00 +0800
Subject: [PATCH] 规范命名
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java | 45 +++
phis-feign/src/main/java/com/hz/his/dto/gzh/GzhDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/SCouponService.java | 12
phis-feign/src/main/java/com/hz/his/feign/service/SShopService.java | 11
phis-feign/src/main/java/com/hz/his/dto/channel/ChannelDto.java | 9
phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java | 64 ++--
phis-feign/src/main/java/com/hz/his/dto/user/money/UserRechargeDto.java | 27 ++
phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/TimeDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java | 25 +
phis-feign/src/main/java/com/hz/his/feign/service/SConsumablesService.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/SMemberLevelService.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/SOrderService.java | 5
phis-feign/src/main/java/com/hz/his/dto/user/money/UserWaitIncDto.java | 37 --
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/SEmployeeService.java | 9
phis-feign/src/main/java/com/hz/his/feign/service/SFileService.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java | 31 ++
phis-feign/src/main/java/com/hz/his/feign/service/SProjectService.java | 10
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java | 30 ++
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java | 33 ++
phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java | 19 +
phis-feign/src/main/java/com/hz/his/dto/limit/LimitDto.java | 20 +
phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/file/FileUpdateDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/SPromotionService.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/SLimitService.java | 6
phis-feign/src/main/java/com/hz/his/dto/user/label/UserLabelDto.java | 9
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/SLabelService.java | 4
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/shop/ShopDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/user/coupon/HisGoodsDto.java | 21 -
phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java | 24 +
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/user/UserLevelDto.java | 11
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java | 30 ++
phis-feign/src/main/java/com/hz/his/feign/service/SUserLevelService.java | 6
phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/card/CardDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java | 28 ++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserConsumeDto.java | 34 ++
/dev/null | 33 --
phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectUsedDto.java | 19 +
phis-feign/src/main/java/com/hz/his/dto/file/FileDownDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/SCardItemService.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/SGzhService.java | 6
50 files changed, 562 insertions(+), 199 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/TimeDt.java b/phis-feign/src/main/java/com/hz/his/dto/TimeDto.java
similarity index 73%
rename from phis-feign/src/main/java/com/hz/phis/dt/TimeDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/TimeDto.java
index 0041fa6..5bef2a0 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/TimeDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/TimeDto.java
@@ -1,6 +1,4 @@
-package com.hz.phis.dt;
-
-import lombok.Data;
+package com.hz.his.dto;
import java.util.Date;
@@ -8,24 +6,24 @@
* @author fwq
* 鏃堕棿鎵╁睍绫�
*/
-public class TimeDt {
+public class TimeDto {
private String timeString;
private Date timeDate;
- public TimeDt(String timeString) {
+ public TimeDto(String timeString) {
this.timeString = timeString;
}
- public TimeDt(Date timeDate) {
+ public TimeDto(Date timeDate) {
this.timeDate = timeDate;
}
- public TimeDt() {
+ public TimeDto() {
}
- public TimeDt(String timeString, Date timeDate) {
+ public TimeDto(String timeString, Date timeDate) {
this.timeString = timeString;
this.timeDate = timeDate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/card/CardDto.java b/phis-feign/src/main/java/com/hz/his/dto/card/CardDto.java
new file mode 100644
index 0000000..731a04a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/card/CardDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.card;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鍗￠」鎵╁睍
+ * */
+@Data
+public class CardDto extends PageDto {
+ /**鏇存柊鏃堕棿*/
+ private String editTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelDto.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/channel/ChannelDto.java
index 8774223..e43f702 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/channel/ChannelDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/channel/ChannelDto.java
@@ -1,11 +1,14 @@
-package com.hz.phis.dt.channel;
+package com.hz.his.dto.channel;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
-/**娓犻亾鎵╁睍*/
+/**
+ * @author fwq
+ * 娓犻亾鎵╁睍
+ * */
@Data
-public class ChannelDt {
+public class ChannelDto {
/**娓犻亾鏍囪瘑*/
private String id;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java b/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
new file mode 100644
index 0000000..031d046
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consumables/ConsumablesDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.consumables;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鑰楁潗鎵╁睍
+ * */
+@Data
+public class ConsumablesDto extends PageDto {
+ /**鏇存柊鏃堕棿*/
+ private String editTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDt.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
similarity index 68%
rename from phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 0f9f4a7..38bf6c7 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.coupon;
+package com.hz.his.dto.coupon;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -8,7 +8,7 @@
* 浼樻儬鍒告墿灞�
* */
@Data
-public class CouponDt extends PageDto {
+public class CouponDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponGoodsDt.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
similarity index 89%
rename from phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponGoodsDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
index 19737e0..a05323d 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/coupon/CouponGoodsDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.coupon;
+package com.hz.his.dto.coupon;
import lombok.Data;
@@ -10,7 +10,7 @@
* 鍟嗗搧浼樻儬鍒告墿灞�
* */
@Data
-public class CouponGoodsDt {
+public class CouponGoodsDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
index dcd647d..d611a7f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpDocDto.java
@@ -3,6 +3,10 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+/**
+ * @author fwq
+ * 鍛樺伐鍖荤敓
+ * */
@Data
public class EmpDocDto extends PageDto {
/**绉戝*/
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
similarity index 66%
rename from phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index f05936e..f0aa39c 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/employee/EmployeeDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.employee;
+package com.hz.his.dto.employee;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -8,7 +8,7 @@
* 鍛樺伐鎵╁睍
* */
@Data
-public class EmployeeDt extends PageDto {
+public class EmployeeDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/file/FileDownDto.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileDownDto.java
similarity index 86%
rename from phis-feign/src/main/java/com/hz/phis/dt/file/FileDownDto.java
rename to phis-feign/src/main/java/com/hz/his/dto/file/FileDownDto.java
index 33e5782..d6b965b 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/file/FileDownDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileDownDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.file;
+package com.hz.his.dto.file;
import lombok.Data;
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/file/FileUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileUpdateDto.java
similarity index 60%
rename from phis-feign/src/main/java/com/hz/phis/dt/file/FileUpdateDto.java
rename to phis-feign/src/main/java/com/hz/his/dto/file/FileUpdateDto.java
index 4606ae4..e065c86 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/file/FileUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileUpdateDto.java
@@ -1,7 +1,6 @@
-package com.hz.phis.dt.file;
+package com.hz.his.dto.file;
import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
/**鏂囦欢涓婁紶鎵╁睍*/
@Data
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/gzh/GzhDt.java b/phis-feign/src/main/java/com/hz/his/dto/gzh/GzhDto.java
similarity index 66%
rename from phis-feign/src/main/java/com/hz/phis/dt/gzh/GzhDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/gzh/GzhDto.java
index efa849a..b2cfb8d 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/gzh/GzhDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/gzh/GzhDto.java
@@ -1,11 +1,11 @@
-package com.hz.phis.dt.gzh;
+package com.hz.his.dto.gzh;
import com.hz.his.dto.PageDto;
import lombok.Data;
/**鍏紬鍙锋墿灞�*/
@Data
-public class GzhDt extends PageDto {
+public class GzhDto extends PageDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java b/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java
new file mode 100644
index 0000000..63541d9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/label/LabelTypePageDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.label;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+/**
+ * @author fwq
+ * 鏍囩鍒嗙被鎵╁睍
+ * */
+@Data
+public class LabelTypePageDto extends PageDto {
+
+ /**绾у埆 0涓�绾� 1浜岀骇*/
+ private Integer level;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/limit/LimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/limit/LimitDto.java
new file mode 100644
index 0000000..6e3878e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/limit/LimitDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.limit;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 闄愬埗淇℃伅鎵╁睍
+ * */
+@Data
+public class LimitDto extends PageDto {
+ /**鏇存柊鏃堕棿*/
+ private String editTime;
+ /**鏇存柊鏃堕棿*/
+ private String hisId;
+ /**鏇存柊鏃堕棿*/
+ private String type;
+ /**闄愬埗*/
+ private String appId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java b/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java
new file mode 100644
index 0000000..4f35272
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/member/MemberDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.member;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+/**
+ * @author fwq
+ * 浼氬憳鎵╁睍
+ * */
+@Data
+public class MemberDto extends PageDto {
+
+ /**棰勭害鏍囪瘑*/
+ private String id;
+ /**浼氬憳绛夌骇鍙�*/
+ private String hisNo;
+ /**浼氬憳绛夌骇鍚嶇О*/
+ private String name;
+ /**鏄惁鏅�氫細鍛�*/
+ private Integer isOrdinary;
+ /**寮�濮嬪尯闂�*/
+ private BigDecimal startExperience;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
new file mode 100644
index 0000000..5c8d40d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -0,0 +1,45 @@
+package com.hz.his.dto.order;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 璁㈠崟鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class OrderDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+ /**鏌ヨ鍗曚釜鏃堕棿*/
+ private String time;
+ /**璁㈠崟鐘舵��*/
+ private Integer status;
+ /**鍟嗗搧绫诲瀷 椤圭洰锛歱roject锛屽晢鍝佽嵂鍝侊細retail锛屼績閿�锛歱romotion锛屽崱椤癸細card*/
+ private String goodsType;
+ /**璁㈠崟绫诲瀷*/
+ private String type;
+
+ /**璁㈠崟id*/
+ private String orderId;
+ /**璁㈠崟閲戦*/
+ private BigDecimal amount;
+ /**鍌ㄥ�奸噾-鍓嶇濉啓*/
+ private BigDecimal rechargeMoney;
+ /**澧炲�奸噾-鍓嶇濉啓**/
+ private BigDecimal incrementMoney;
+ /**绉垎-鍓嶇濉啓*/
+ private BigDecimal integralNum;
+
+ /**鏄惁鏌ヨ绉垎璁㈠崟*/
+ private Integer isIntegral;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
new file mode 100644
index 0000000..3d35463
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 椤圭洰鎵╁睍
+ * */
+@Data
+public class ProjectDto extends PageDto {
+ /**鏇存柊鏃堕棿*/
+ private String editTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
new file mode 100644
index 0000000..efd6d47
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.promotion;
+
+import lombok.Data;
+
+/**
+ * 淇冮攢鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class PromotionDto {
+
+ /**鏇存柊鏃堕棿*/
+ private String editTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopDto.java
similarity index 69%
rename from phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/shop/ShopDto.java
index 04b33dd..ead73db 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/shop/ShopDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.shop;
+package com.hz.his.dto.shop;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -8,7 +8,7 @@
* 闂ㄥ簵鎵╁睍
* */
@Data
-public class ShopDt extends PageDto {
+public class ShopDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserAppointmentDt.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
similarity index 64%
rename from phis-feign/src/main/java/com/hz/phis/dt/user/UserAppointmentDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
index c8c496d..b34de36 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserAppointmentDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserAppointmentDto.java
@@ -1,13 +1,11 @@
-package com.hz.phis.dt.user;
+package com.hz.his.dto.user;
import com.hz.his.dto.PageDto;
import lombok.Data;
-import java.math.BigDecimal;
-
/**鐢ㄦ埛棰勭害鏁版嵁鎵╁睍*/
@Data
-public class UserAppointmentDt extends PageDto {
+public class UserAppointmentDto extends PageDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
/**鐘舵��:1宸插畬鎴�*/
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index a04cc54..9b58d74 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,4 +1,4 @@
-package com.hz.phis.dt.user;
+package com.hz.his.dto.user;
import lombok.Data;
@@ -6,7 +6,7 @@
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@Data
-public class UserDt {
+public class UserDto {
private String id;
private String CIQ;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserLevelDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserLevelDto.java
new file mode 100644
index 0000000..c2f3f40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserLevelDto.java
@@ -0,0 +1,11 @@
+package com.hz.his.dto.user;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**浼氬憳绛夌骇*/
+@Data
+public class UserLevelDto extends PageDto {
+ /**phis浼氬憳鏍囪瘑*/
+ private String userId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
new file mode 100644
index 0000000..0fd807a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.user.card;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛椤圭洰鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class UserCardDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鍗￠」鏍囪瘑*/
+ private String cardItemId;
+ /**瀛愯鍗曠紪鍙�*/
+ private String orderItemNo;
+ /**鏈夋晥鐘舵��:1鏈夋晥2鏃犳晥3宸蹭娇鐢�4杩囨湡鏃犳晥5宸插彇娑�*/
+ private Integer effectiveStatus;
+ /**鐘舵��:0鏈娇鐢�1宸蹭娇鐢�2杞禒3浣跨敤涓�*/
+ private Integer status;
+ /**鏈夋晥寮�濮�*/
+ private String effectiveStartTime;
+ /**鏈夋晥缁撴潫*/
+ private String effectiveEndTime;
+}
+
+
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java
new file mode 100644
index 0000000..d29fe97
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardUsedDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.user.card;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛椤圭洰浣跨敤鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class UserCardUsedDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**瀛愯鍗曠紪鍙�*/
+ private String orderItemNo;
+
+}
+
+
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/HisGoodsDt.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/HisGoodsDto.java
similarity index 71%
rename from phis-feign/src/main/java/com/hz/phis/dt/user/coupon/HisGoodsDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/coupon/HisGoodsDto.java
index 3fd0a8f..c543c22 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/HisGoodsDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/HisGoodsDto.java
@@ -1,10 +1,12 @@
-package com.hz.phis.dt.user.coupon;
+package com.hz.his.dto.user.coupon;
import com.hz.his.dto.PageDto;
+import lombok.Data;
/**鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�*/
-public class HisGoodsDt extends PageDto {
+@Data
+public class HisGoodsDto extends PageDto {
/**鐢ㄦ埛鏍囪瘑*/
private String hisId;
/**hisType*/
@@ -30,19 +32,4 @@
/**绫诲瀷-绉垎鍟嗗搧*/
public static final String TYPE_GOODS_INTEGRAL = "goods_integral";
- public String getHisId() {
- return hisId;
- }
-
- public void setHisId(String hisId) {
- this.hisId = hisId;
- }
-
- public String getHisType() {
- return hisType;
- }
-
- public void setHisType(String hisType) {
- this.hisType = hisType;
- }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
new file mode 100644
index 0000000..daed734
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.user.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.user.coupon.HisGoodsDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author fwq
+ * 鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�
+ * */
+@Data
+public class UserCanUseCouponDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**婊¤冻閲戦*/
+ private BigDecimal total;
+ /**婊¤冻浠舵暟*/
+ private Integer itemNum;
+ /**鍟嗗搧瀵瑰簲鐨刪is鏍囪瘑*/
+ private List<HisGoodsDto> hisGoodsDtoList;
+}
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
new file mode 100644
index 0000000..e32c806
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -0,0 +1,31 @@
+package com.hz.his.dto.user.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鐢ㄦ埛浼樻儬鍒告墿灞�
+ * */
+@Data
+public class UserCouponDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鏈夋晥鐘舵�侊細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;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/label/UserLabelDt.java b/phis-feign/src/main/java/com/hz/his/dto/user/label/UserLabelDto.java
similarity index 78%
rename from phis-feign/src/main/java/com/hz/phis/dt/user/label/UserLabelDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/label/UserLabelDto.java
index 4f742b6..ba4b534 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/label/UserLabelDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/label/UserLabelDto.java
@@ -1,12 +1,11 @@
-package com.hz.phis.dt.user.label;
+package com.hz.his.dto.user.label;
import lombok.Data;
-import java.math.BigDecimal;
-
-/**鐢ㄦ埛鏍囩*/
+/**
+ * 鐢ㄦ埛鏍囩*/
@Data
-public class UserLabelDt {
+public class UserLabelDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserConsumeDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserConsumeDto.java
new file mode 100644
index 0000000..239dd84
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserConsumeDto.java
@@ -0,0 +1,34 @@
+package com.hz.his.dto.user.money;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鐢ㄦ埛娑堣垂
+ * */
+@Data
+public class UserConsumeDto extends PageDto {
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**閲戦绫诲瀷*/
+ private Integer type;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer opType;
+
+ /**閲戦绫诲瀷-鍌ㄥ�奸噾*/
+ public static final int TYPE_STORED_VALUE_FUND = 0;
+ /**閲戦绫诲瀷-澧炲�奸噾*/
+ public static final int TYPE_VALUE_ADDED_FUND = 1;
+ /**閲戦绫诲瀷-绉垎*/
+ public static final int TYPE_INTEGRAL = 2;
+ /**閲戦绫诲瀷-棰勫畾閲�*/
+ public static final int TYPE_DEPOSIT = 3;
+
+ /**鎿嶄綔绫诲瀷-澧炲姞*/
+ public static final int OP_TYPE_INCREASE = 1;
+ /**鎿嶄綔绫诲瀷-鍑忓皯*/
+ public static final int OP_TYPE_REDUCE = 2;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
new file mode 100644
index 0000000..5dd73ae
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.user.money;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛澧炲�奸噾鍒楄〃
+ * @author fwq
+ * */
+@Data
+public class UserIncrementDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**璁㈠崟id*/
+ private String orderId;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**璁㈠崟瀛愭爣璇�*/
+ private String orderItemId;
+ /**瀛愯鍗曞彿*/
+ private String orderItemNo;
+ /**璁㈠崟绫诲瀷*/
+ private String orderType;
+
+
+ /**璁板綍鏍囪瘑*/
+ private String recordId;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer opType;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
new file mode 100644
index 0000000..04617ed
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.user.money;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛澧炲�奸噾鍒楄〃
+ * @author fwq
+ * */
+@Data
+public class UserIntegralDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**璁㈠崟id*/
+ private String orderId;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**璁㈠崟瀛愭爣璇�*/
+ private String orderItemId;
+ /**瀛愯鍗曞彿*/
+ private String orderItemNo;
+ /**璁㈠崟绫诲瀷*/
+ private String orderType;
+
+
+ /**璁板綍鏍囪瘑*/
+ private String recordId;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer opType;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserRechargeDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserRechargeDto.java
new file mode 100644
index 0000000..3846d3d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserRechargeDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.user.money;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鍌ㄥ�奸噾鍒楄〃
+ * @author fwq
+ * */
+@Data
+public class UserRechargeDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer opType;
+ /**璁㈠崟id*/
+ private String orderId;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**璁㈠崟瀛愭爣璇�*/
+ private String orderItemId;
+ /**瀛愯鍗曞彿*/
+ private String orderItemNo;
+
+}
+
+
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserWaitIncDto.java
similarity index 72%
rename from phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/money/UserWaitIncDto.java
index c6485c2..3e7c468 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserWaitIncDto.java
@@ -1,12 +1,14 @@
-package com.hz.phis.dt.user.money;
+package com.hz.his.dto.user.money;
import com.hz.his.dto.PageDto;
+import lombok.Data;
/**
* 鐢ㄦ埛寰呴鍙栧鍊奸噾鍒楄〃
* @author fwq
* */
-public class UserWaitIncDt extends PageDto {
+@Data
+public class UserWaitIncDto extends PageDto {
/**phis鐢ㄦ埛鏍囪瘑*/
private String userId;
/**璧勯噾绫诲瀷*/
@@ -16,37 +18,6 @@
/**鐘舵��0 绛夊緟澶勭悊 1 澶勭悊鎴愬姛*/
private Integer status;
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public Integer getFundType() {
- return fundType;
- }
-
- public void setFundType(Integer fundType) {
- this.fundType = fundType;
- }
-
- public Integer getFundOpType() {
- return fundOpType;
- }
-
- public void setFundOpType(Integer fundOpType) {
- this.fundOpType = fundOpType;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
/**璧勯噾绫诲瀷-鍌ㄥ�奸噾*/
public static final int FUND_TYPE_STORED_VALUE_FUND = 0;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
new file mode 100644
index 0000000..85934fe
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectDto.java
@@ -0,0 +1,33 @@
+package com.hz.his.dto.user.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛椤圭洰鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class UserProjectDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鍟嗗搧绫诲瀷锛歱roject椤圭洰goods鍟嗗搧card鍗￠」*/
+ private String type;
+ /**鍟嗗搧缂栧彿*/
+ private String goodsNo;
+ /**鍟嗗搧鏍囪瘑*/
+ private String goodsId;
+ /**鏈夋晥鐘舵��:1鏈夋晥2鏃犳晥3宸蹭娇鐢�4杩囨湡鏃犳晥5宸插彇娑�*/
+ private Integer effectiveStatus;
+ /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+ private String userProjectId;
+ /**瀛愯鍗曟爣璇�*/
+ private String orderItemId;
+ /**瀛愯鍗曠紪鍙�*/
+ private String orderItemNo;
+ /**璁㈠崟鍙�*/
+ private String orderId;
+
+}
+
+
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectUsedDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectUsedDto.java
new file mode 100644
index 0000000..8a0ec2c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/UserProjectUsedDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.user.project;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛椤圭洰浣跨敤鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class UserProjectUsedDto extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**瀛愯鍗曠紪鍙�*/
+ private String orderItemNo;
+
+}
+
+
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/SCardItemService.java
index 1e064c2..ae17171 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/SCardItemService.java
@@ -2,7 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.card.CardDt;
+import com.hz.his.dto.card.CardDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,5 +51,5 @@
* @return Result
*/
@PostMapping(value = "/cardItem/update/list")
- Result getUpdateCardItem(@RequestBody CardDt cardDt);
+ Result getUpdateCardItem(@RequestBody CardDto cardDto);
}
\ No newline at end of file
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/SConsumablesService.java
index 8a38fe1..427b5c9 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/SConsumablesService.java
@@ -2,7 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.consumables.ConsumablesDt;
+import com.hz.his.dto.consumables.ConsumablesDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,5 +34,5 @@
* @return Result
*/
@PostMapping(value = "/consumables/update/list")
- Result getUpdateConsumables(@RequestBody ConsumablesDt consumablesDt);
+ Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);
}
\ No newline at end of file
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/SCouponService.java
index 4d03385..39959ee 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/SCouponService.java
@@ -2,8 +2,8 @@
import com.hx.resultTool.Result;
-import com.hz.phis.dt.coupon.CouponDt;
-import com.hz.phis.dt.coupon.CouponGoodsDt;
+import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.coupon.CouponGoodsDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -20,21 +20,21 @@
* @return Result
*/
@PostMapping(value = "/coupon/list/appoint")
- Result getListAppoint(@RequestBody CouponDt couponDt);
+ Result getListAppoint(@RequestBody CouponDto couponDto);
/**
* 鑾峰彇浼樻儬鍒稿垪琛�
* @return Result
*/
@PostMapping(value = "/coupon/list")
- Result getList(@RequestBody CouponDt couponDt);
+ Result getList(@RequestBody CouponDto couponDto);
/**
* 鍟嗗搧鍙鍙栦紭鎯犲埜
*/
@PostMapping(value = "/goods/receive/coupon")
- Result goodsReceiveCoupon(@RequestBody CouponGoodsDt couponGoodsDt);
+ Result goodsReceiveCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
/**
@@ -48,6 +48,6 @@
* 鍟嗗搧鍙敤浼樻儬鍒�
*/
@PostMapping(value = "/goods/canUsed/coupon")
- Result goodsCanUsedCoupon(@RequestBody CouponGoodsDt couponGoodsDt);
+ Result goodsCanUsedCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
}
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/SEmployeeService.java
index e2f0ec8..11c0f2f 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/SEmployeeService.java
@@ -2,10 +2,9 @@
import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
import com.hz.his.dto.employee.EmpDocDto;
-import com.hz.phis.dt.TimeDt;
-import com.hz.phis.dt.employee.EmployeeDt;
+import com.hz.his.dto.TimeDto;
+import com.hz.his.dto.employee.EmployeeDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -29,13 +28,13 @@
* 鏌ヨ鍛樺伐鍒楄〃
*/
@PostMapping(value = "/emp/page/list")
- Result getEmpList(@RequestBody(required = false) EmployeeDt employeeDt);
+ Result getEmpList(@RequestBody(required = false) EmployeeDto employeeDto);
/**
* 鏌ヨ鍛樺伐鍒楄〃
*/
@PostMapping(value = "/emp/list")
- Result getList(@RequestBody(required = false) TimeDt timeDt);
+ Result getList(@RequestBody(required = false) TimeDto timeDto);
/**
* 鏌ヨ鍖荤敓鍛樺伐鍒楄〃
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/SFileService.java
index aec887b..068f7fc 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/SFileService.java
@@ -1,7 +1,7 @@
package com.hz.his.feign.service;
import com.hx.resultTool.Result;
-import com.hz.phis.dt.file.FileDownDto;
+import com.hz.his.dto.file.FileDownDto;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
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/SGzhService.java
index 14fc9fc..f7c9149 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/SGzhService.java
@@ -1,12 +1,10 @@
package com.hz.his.feign.service;
import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.gzh.GzhDt;
+import com.hz.his.dto.gzh.GzhDto;
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 鏄姹傛帴鍙ｅ墠缂�
@@ -18,6 +16,6 @@
* 鑾峰彇鍏紬鍙风粦瀹氬垪琛�
*/
@PostMapping(value = "/gzh/list")
- Result getGzhList(@RequestBody GzhDt gzhDt);
+ Result getGzhList(@RequestBody GzhDto gzhDto);
}
\ No newline at end of file
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/SLabelService.java
index adae889..6205fe1 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/SLabelService.java
@@ -2,7 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.label.LabelTypePageDt;
+import com.hz.his.dto.label.LabelTypePageDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +19,7 @@
* @return Result
*/
@PostMapping(value = "/label/type/list")
- Result getLabelTypeList(@RequestBody(required = false) LabelTypePageDt pageDt);
+ Result getLabelTypeList(@RequestBody(required = false) LabelTypePageDto labelTypePageDto);
/**
* 鑾峰彇鏍囩鍒嗙被鍒楄〃
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/SLimitService.java
index 0fe3b52..d4c900d 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/SLimitService.java
@@ -1,7 +1,7 @@
package com.hz.his.feign.service;
import com.hx.resultTool.Result;
-import com.hz.phis.dt.limit.LimitDt;
+import com.hz.his.dto.limit.LimitDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,9 +49,9 @@
/**鑾峰彇鏇存柊闄愬埗*/
@PostMapping(value = "/goods/update/limit")
- Result getUpdateList(@RequestBody LimitDt limitDt);
+ Result getUpdateList(@RequestBody LimitDto limitDto);
/**鏌ヨ鏄惁鍙笂鏋�*/
@PostMapping(value = "/goods/check/limit")
- Result getCheckSku(@RequestBody LimitDt limitDt);
+ Result getCheckSku(@RequestBody LimitDto limitDto);
}
\ No newline at end of file
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/SMemberLevelService.java
index 056abaa..3fc31d2 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/SMemberLevelService.java
@@ -2,8 +2,7 @@
import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.member.MemberDt;
+import com.hz.his.dto.member.MemberDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +26,7 @@
* 鏌ヨ浼氬憳绛夌骇鍒楄〃
*/
@PostMapping(value = "/member/level/list")
- Result getMemberLevelList(@RequestBody(required = false) MemberDt pageDto);
+ Result getMemberLevelList(@RequestBody(required = false) MemberDto memberDto);
/**
* 鏍规嵁浼氬憳鍚嶇О鏌ヨ浼氬憳绛夌骇璇︽儏
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/SOrderService.java
index 5da43ac..af898cf 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/SOrderService.java
@@ -1,8 +1,7 @@
package com.hz.his.feign.service;
import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.order.OrderDt;
+import com.hz.his.dto.order.OrderDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +17,7 @@
* 璁㈠崟鍒楄〃
*/
@PostMapping(value = "/order/list")
- Result orderList(@RequestBody OrderDt orderDt);
+ Result orderList(@RequestBody OrderDto orderDto);
/**
* 璁㈠崟璇︽儏
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/SProjectService.java
index 9e3979f..bdc26bc 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/SProjectService.java
@@ -2,8 +2,8 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.TimeDt;
-import com.hz.phis.dt.project.ProjectDt;
+import com.hz.his.dto.TimeDto;
+import com.hz.his.dto.project.ProjectDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -61,19 +61,19 @@
* @return Result
*/
@PostMapping(value = "/project/sku/shop/price/update")
- Result getUpdateShopPrice(@RequestBody TimeDt timeDt);
+ Result getUpdateShopPrice(@RequestBody TimeDto timeDto);
/**
* 鑾峰彇椤圭洰sku鍒楄〃(鍚屾浣跨敤)
* @return Result
*/
@PostMapping(value = "/project/page/sku/update")
- Result getUpdateProject(@RequestBody ProjectDt projectDt);
+ Result getUpdateProject(@RequestBody ProjectDto projectDto);
/**
* 鑾峰彇椤圭洰spu鍒楄〃(鍚屾浣跨敤)
* @return Result
*/
@PostMapping(value = "/project/page/spu/update")
- Result getUpdateSpuProject(@RequestBody ProjectDt projectDt);
+ Result getUpdateSpuProject(@RequestBody ProjectDto projectDto);
}
\ No newline at end of file
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/SPromotionService.java
index 7fc504f..ba272ed 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/SPromotionService.java
@@ -2,8 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.card.CardDt;
-import com.hz.phis.dt.promotion.PromotionDt;
+import com.hz.his.dto.promotion.PromotionDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -41,5 +40,5 @@
/**鑾峰彇淇冮攢鏇存柊鍒楄〃*/
@PostMapping(value = "/promotion/update/list")
- Result getUpdatePromotion(@RequestBody PromotionDt promotionDt);
+ Result getUpdatePromotion(@RequestBody PromotionDto promotionDto);
}
\ No newline at end of file
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/SShopService.java
index 00ea97a..91843a6 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/SShopService.java
@@ -2,15 +2,12 @@
import com.hx.resultTool.Result;
-import com.hz.his.dto.PageDto;
-import com.hz.phis.dt.TimeDt;
-import com.hz.phis.dt.shop.ShopDt;
+import com.hz.his.dto.TimeDto;
+import com.hz.his.dto.shop.ShopDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Date;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -31,12 +28,12 @@
* @return Result
*/
@PostMapping(value = "/shop/page/list")
- Result getShopList(@RequestBody ShopDt shopDt);
+ Result getShopList(@RequestBody ShopDto shopDto);
/**
* 鑾峰彇闂ㄥ簵鏇存柊鍒楄〃
* @return Result
*/
@PostMapping(value = "/shop/list")
- Result getList(@RequestBody TimeDt timeDt);
+ Result getList(@RequestBody TimeDto timeDto);
}
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/SUserLevelService.java
index c45b686..049c7ed 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/SUserLevelService.java
@@ -9,7 +9,7 @@
*/
import com.hx.resultTool.Result;
-import com.hz.phis.dt.member.MemberDt;
+import com.hz.his.dto.member.MemberDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,9 +22,9 @@
/**
* 鏌ヨ浼氬憳绛夌骇鍒楄〃
- * @param memberDt 浼氬憳绛夌骇
+ * @param memberDto 浼氬憳绛夌骇
* @return
*/
@PostMapping(value = "/member/getMemberLevelList")
- Result getMemberLevelList(@RequestBody MemberDt memberDt);
+ Result getMemberLevelList(@RequestBody MemberDto 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/SUserService.java
index 1f39fd0..eb77bfd 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/SUserService.java
@@ -1,17 +1,17 @@
package com.hz.his.feign.service;
import com.hx.resultTool.Result;
-import com.hz.phis.dt.user.UserAppointmentDt;
-import com.hz.phis.dt.user.UserDt;
-import com.hz.phis.dt.user.UserLevelDt;
-import com.hz.phis.dt.user.card.UserCardDt;
-import com.hz.phis.dt.user.card.UserCardUsedDt;
-import com.hz.phis.dt.user.coupon.UserCanUseCouponDt;
-import com.hz.phis.dt.user.coupon.UserCouponDt;
-import com.hz.phis.dt.user.money.*;
-import com.hz.phis.dt.user.label.UserLabelDt;
-import com.hz.phis.dt.user.project.UserProjectDt;
-import com.hz.phis.dt.user.project.UserProjectUsedDt;
+import com.hz.his.dto.user.UserAppointmentDto;
+import com.hz.his.dto.user.UserDto;
+import com.hz.his.dto.user.UserLevelDto;
+import com.hz.his.dto.user.card.UserCardDto;
+import com.hz.his.dto.user.card.UserCardUsedDto;
+import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
+import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.money.*;
+import com.hz.his.dto.user.label.UserLabelDto;
+import com.hz.his.dto.user.project.UserProjectDto;
+import com.hz.his.dto.user.project.UserProjectUsedDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -42,32 +42,32 @@
* 鑾峰彇鐢ㄦ埛椤圭洰
*/
@PostMapping(value = "/user/project/list")
- Result userProject(@RequestBody UserProjectDt userProjectDt);
+ Result userProject(@RequestBody UserProjectDto userProjectDto);
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩�
*/
@PostMapping(value = "/user/project/item/list")
- Result userProjectItem(@RequestBody UserProjectDt userProjectDt);
+ Result userProjectItem(@RequestBody UserProjectDto userProjectDto);
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩娇鐢ㄨ褰�
*/
@PostMapping(value = "/user/project/used")
- Result userProjectUsed(@RequestBody UserProjectUsedDt userProjectUsedDt);
+ Result userProjectUsed(@RequestBody UserProjectUsedDto userProjectUsedDto);
/**
* 鑾峰彇鐢ㄦ埛鍗″寘
*/
@PostMapping(value = "/user/card")
- Result userCard(@RequestBody UserCardDt userCardDt);
+ Result userCard(@RequestBody UserCardDto userCardDto);
/**
* 鑾峰彇鐢ㄦ埛鍗″寘浣跨敤璁板綍
*/
@PostMapping(value = "/user/card/used")
- Result userCardUsed(@RequestBody UserCardUsedDt userCardUsedDt);
+ Result userCardUsed(@RequestBody UserCardUsedDto userCardUsedDto);
/**
@@ -82,50 +82,50 @@
* 鑾峰彇鐢ㄦ埛浼樻儬鍒�
* */
@PostMapping(value = "/user/coupon")
- Result userCoupon(@RequestBody UserCouponDt userCouponDt);
+ Result userCoupon(@RequestBody UserCouponDto userCouponDto);
/**
* 鑾峰彇鐢ㄦ埛浼樻儬鍒镐娇鐢ㄨ褰�
* */
@PostMapping(value = "/user/coupon/used")
- Result userCouponUsed(@RequestParam UserCouponDt userCouponDt);
+ Result userCouponUsed(@RequestParam UserCouponDto userCouponDto);
/**
* 鑾峰彇鐢ㄦ埛澧炲�奸噾鍒楄〃
* */
@PostMapping(value = "/user/increment/list")
- Result userIncrementList(@RequestBody UserIncrementDt userIncrementDt);
+ Result userIncrementList(@RequestBody UserIncrementDto userIncrementDto);
/**
* 鑾峰彇鐢ㄦ埛澧炲�奸噾浣跨敤璁板綍
* */
@PostMapping(value = "/user/increment/used")
- Result userIncrementUsed(@RequestBody UserIncrementDt userIncrementDt);
+ Result userIncrementUsed(@RequestBody UserIncrementDto userIncrementDto);
/**
* 鑾峰彇鐢ㄦ埛鍌ㄥ�奸噾鍒楄〃
* */
@PostMapping(value = "/user/recharge/list")
- Result userRechargeList(@RequestBody UserRechargeDt userRechargeDt);
+ Result userRechargeList(@RequestBody UserRechargeDto userRechargeDto);
/**
* 鑾峰彇鐢ㄦ埛璧勯噾浣跨敤璁板綍
* */
@PostMapping(value = "/user/money/used")
- Result userConsumeDt(@RequestBody UserConsumeDt userConsumeDt);
+ Result userConsumeDt(@RequestBody UserConsumeDto userConsumeDto);
/**
* 鑾峰彇鐢ㄦ埛绉垎鍒楄〃
* */
@PostMapping(value = "/user/integral/list")
- Result userIntegralList(@RequestBody UserIntegralDt userIntegralDt);
+ Result userIntegralList(@RequestBody UserIntegralDto userIntegralDto);
/**
* 鑾峰彇鐢ㄦ埛绉垎浣跨敤璁板綍
* */
@PostMapping(value = "/user/integral/used")
- Result userIntegralUsed(@RequestBody UserIntegralDt userIntegralDt);
+ Result userIntegralUsed(@RequestBody UserIntegralDto userIntegralDto);
/**
* 鏍规嵁鐢佃瘽鍙风爜鏌ヨ鐢ㄦ埛淇℃伅
@@ -146,13 +146,13 @@
* @param
* */
@PostMapping(value = "/user/can/use/coupon")
- Result userCanUseCoupon(@RequestBody UserCanUseCouponDt userCanUseCouponDt);
+ Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
/**
* 鏍规嵁鐢佃瘽鍙风爜鎴栬�匔IQ鑾峰彇鎸囧畾鐢ㄦ埛
* */
@PostMapping(value = "/user/info/telOrCiq")
- Result findUserByTelOrCiq(@RequestBody UserDt userDt);
+ Result findUserByTelOrCiq(@RequestBody UserDto userDto);
/**
@@ -160,7 +160,7 @@
* @param
* */
@PostMapping(value = "/user/label")
- Result userLabel(@RequestBody UserLabelDt userLabelDt);
+ Result userLabel(@RequestBody UserLabelDto userLabelDto);
/**
@@ -168,31 +168,31 @@
* @param
* */
@PostMapping(value = "/user/consume/count")
- Result userConsumeCount(@RequestBody UserConsumeDt userConsumeDt);
+ Result userConsumeCount(@RequestBody UserConsumeDto userConsumeDto);
/**
* 鑾峰彇鐢ㄦ埛棰勭害鏁版嵁
* */
@PostMapping(value = "/user/appointment/list")
- Result userAppointment(@RequestBody UserAppointmentDt userAppointmentDt);
+ Result userAppointment(@RequestBody UserAppointmentDto userAppointmentDto);
/**
* 鑾峰彇鐢ㄦ埛鍒掓墸璁板綍
* */
@PostMapping(value = "/user/project/deduction/list")
- Result userProjectDeduction(@RequestBody UserProjectDt userProjectDt);
+ Result userProjectDeduction(@RequestBody UserProjectDto userProjectDto);
/**
* 鑾峰彇浼氬憳绛夌骇鍙樺寲璁板綍
* */
@PostMapping(value = "/user/level/record/list")
- Result userLevelRecord(@RequestBody UserLevelDt userLevelDt);
+ Result userLevelRecord(@RequestBody UserLevelDto userLevelDto);
/**
* 鑾峰彇鐢ㄦ埛寰呴鍙栧鍊奸噾鍒楄〃
* */
@PostMapping(value = "/user/wait/increment/list")
- Result userWaitIncList(@RequestBody UserWaitIncDt userWaitIncDt);
+ Result userWaitIncList(@RequestBody UserWaitIncDto userWaitIncDto);
}
\ No newline at end of file
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
deleted file mode 100644
index a9aec6f..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hz.phis.dt.card;
-
-import com.hz.his.dto.PageDto;
-
-/**鍗￠」鎵╁睍*/
-public class CardDt extends PageDto {
- /**鏇存柊鏃堕棿*/
- private String editTime;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/ConsumablesDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/ConsumablesDt.java
deleted file mode 100644
index c1cce5a..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/ConsumablesDt.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hz.phis.dt.consumables;
-
-import com.hz.his.dto.PageDto;
-
-/**鑰楁潗鎵╁睍*/
-public class ConsumablesDt extends PageDto {
- /**鏇存柊鏃堕棿*/
- private String editTime;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/label/LabelTypePageDt.java b/phis-feign/src/main/java/com/hz/phis/dt/label/LabelTypePageDt.java
deleted file mode 100644
index 4a66b6c..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/label/LabelTypePageDt.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hz.phis.dt.label;
-
-import com.hz.his.dto.PageDto;
-import lombok.Data;
-/**鏍囩鍒嗙被鎵╁睍*/
-@Data
-public class LabelTypePageDt extends PageDto {
-
- /**绾у埆 0涓�绾� 1浜岀骇*/
- private Integer level;
-}
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
deleted file mode 100644
index 976822f..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitDt.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hz.phis.dt.limit;
-
-import com.hz.his.dto.PageDto;
-
-/**闄愬埗淇℃伅鎵╁睍*/
-public class LimitDt extends PageDto {
- /**鏇存柊鏃堕棿*/
- private String editTime;
- /**鏇存柊鏃堕棿*/
- private String hisId;
- /**鏇存柊鏃堕棿*/
- private String type;
- /**闄愬埗*/
- private String appId;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
-
- public String getHisId() {
- return hisId;
- }
-
- public void setHisId(String hisId) {
- this.hisId = hisId;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getAppId() {
- return appId;
- }
-
- public void setAppId(String appId) {
- this.appId = appId;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/member/MemberDt.java b/phis-feign/src/main/java/com/hz/phis/dt/member/MemberDt.java
deleted file mode 100644
index cd2de47..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/member/MemberDt.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.hz.phis.dt.member;
-
-import com.hz.his.dto.PageDto;
-
-import java.math.BigDecimal;
-/**浼氬憳鎵╁睍*/
-public class MemberDt extends PageDto {
-
- /**棰勭害鏍囪瘑*/
- private String id;
- /**浼氬憳绛夌骇鍙�*/
- private String hisNo;
- /**浼氬憳绛夌骇鍚嶇О*/
- private String name;
- /**鏄惁鏅�氫細鍛�*/
- private Integer isOrdinary;
- /**寮�濮嬪尯闂�*/
- private BigDecimal startExperience;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getHisNo() {
- return hisNo;
- }
-
- public void setHisNo(String hisNo) {
- this.hisNo = hisNo;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getIsOrdinary() {
- return isOrdinary;
- }
-
- public void setIsOrdinary(Integer isOrdinary) {
- this.isOrdinary = isOrdinary;
- }
-
- public BigDecimal getStartExperience() {
- return startExperience;
- }
-
- public void setStartExperience(BigDecimal startExperience) {
- this.startExperience = startExperience;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDt.java
deleted file mode 100644
index 4593265..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDt.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.hz.phis.dt.order;
-
-import com.hz.his.dto.PageDto;
-
-import java.math.BigDecimal;
-
-
-/**
- * 璁㈠崟鎵╁睍
- * @author fwq
- * */
-public class OrderDt extends PageDto {
- /**鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**璁㈠崟鍙�*/
- private String orderNo;
- /**寮�濮嬫椂闂�*/
- private String startTime;
- /**缁撴潫鏃堕棿*/
- private String endTime;
- /**鏌ヨ鍗曚釜鏃堕棿*/
- private String time;
- /**璁㈠崟鐘舵��*/
- private Integer status;
- /**鍟嗗搧绫诲瀷 椤圭洰锛歱roject锛屽晢鍝佽嵂鍝侊細retail锛屼績閿�锛歱romotion锛屽崱椤癸細card*/
- private String goodsType;
- /**璁㈠崟绫诲瀷*/
- private String type;
-
- /**璁㈠崟id*/
- private String orderId;
- /**璁㈠崟閲戦*/
- private BigDecimal amount;
- /**鍌ㄥ�奸噾-鍓嶇濉啓*/
- private BigDecimal rechargeMoney;
- /**澧炲�奸噾-鍓嶇濉啓**/
- private BigDecimal incrementMoney;
- /**绉垎-鍓嶇濉啓*/
- private BigDecimal integralNum;
-
- /**鏄惁鏌ヨ绉垎璁㈠崟*/
- private Integer isIntegral;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getStartTime() {
- return startTime;
- }
-
- public void setStartTime(String startTime) {
- this.startTime = startTime;
- }
-
- public String getEndTime() {
- return endTime;
- }
-
- public void setEndTime(String endTime) {
- this.endTime = endTime;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getGoodsType() {
- return goodsType;
- }
-
- public void setGoodsType(String goodsType) {
- this.goodsType = goodsType;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public BigDecimal getAmount() {
- return amount;
- }
-
- public void setAmount(BigDecimal amount) {
- this.amount = amount;
- }
-
- public Integer getIsIntegral() {
- return isIntegral;
- }
-
- public void setIsIntegral(Integer isIntegral) {
- this.isIntegral = isIntegral;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public BigDecimal getRechargeMoney() {
- return rechargeMoney;
- }
-
- public void setRechargeMoney(BigDecimal rechargeMoney) {
- this.rechargeMoney = rechargeMoney;
- }
-
- public BigDecimal getIncrementMoney() {
- return incrementMoney;
- }
-
- public void setIncrementMoney(BigDecimal incrementMoney) {
- this.incrementMoney = incrementMoney;
- }
-
- public BigDecimal getIntegralNum() {
- return integralNum;
- }
-
- public void setIntegralNum(BigDecimal integralNum) {
- this.integralNum = integralNum;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDt.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDt.java
deleted file mode 100644
index 6cdd8b6..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDt.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hz.phis.dt.project;
-
-import com.hz.his.dto.PageDto;
-
-/**椤圭洰鎵╁睍*/
-public class ProjectDt extends PageDto {
- /**鏇存柊鏃堕棿*/
- private String editTime;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
-}
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
deleted file mode 100644
index fbc2485..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/promotion/PromotionDt.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hz.phis.dt.promotion;
-
-/**淇冮攢鎵╁睍*/
-public class PromotionDt {
-
- /**鏇存柊鏃堕棿*/
- private String editTime;
-
- public String getEditTime() {
- return editTime;
- }
-
- public void setEditTime(String editTime) {
- this.editTime = editTime;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserLevelDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserLevelDt.java
deleted file mode 100644
index 1e0ea95..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserLevelDt.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hz.phis.dt.user;
-
-import com.hz.his.dto.PageDto;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**浼氬憳绛夌骇*/
-@Data
-public class UserLevelDt extends PageDto {
- /**phis浼氬憳鏍囪瘑*/
- private String userId;
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardDt.java
deleted file mode 100644
index 0ee3385..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardDt.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.hz.phis.dt.user.card;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛椤圭洰鎵╁睍
- * @author fwq
- * */
-public class UserCardDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**鍗￠」鏍囪瘑*/
- private String cardItemId;
- /**瀛愯鍗曠紪鍙�*/
- private String orderItemNo;
- /**鏈夋晥鐘舵��:1鏈夋晥2鏃犳晥3宸蹭娇鐢�4杩囨湡鏃犳晥5宸插彇娑�*/
- private Integer effectiveStatus;
- /**鐘舵��:0鏈娇鐢�1宸蹭娇鐢�2杞禒3浣跨敤涓�*/
- private Integer status;
- /**鏈夋晥寮�濮�*/
- private String effectiveStartTime;
- /**鏈夋晥缁撴潫*/
- private String effectiveEndTime;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getCardItemId() {
- return cardItemId;
- }
-
- public void setCardItemId(String cardItemId) {
- this.cardItemId = cardItemId;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-
- public Integer getEffectiveStatus() {
- return effectiveStatus;
- }
-
- public void setEffectiveStatus(Integer effectiveStatus) {
- this.effectiveStatus = effectiveStatus;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getEffectiveStartTime() {
- return effectiveStartTime;
- }
-
- public void setEffectiveStartTime(String effectiveStartTime) {
- this.effectiveStartTime = effectiveStartTime;
- }
-
- public String getEffectiveEndTime() {
- return effectiveEndTime;
- }
-
- public void setEffectiveEndTime(String effectiveEndTime) {
- this.effectiveEndTime = effectiveEndTime;
- }
-}
-
-
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardUsedDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardUsedDt.java
deleted file mode 100644
index 7cea588..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/card/UserCardUsedDt.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hz.phis.dt.user.card;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛椤圭洰浣跨敤鎵╁睍
- * @author fwq
- * */
-public class UserCardUsedDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**瀛愯鍗曠紪鍙�*/
- private String orderItemNo;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-}
-
-
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCanUseCouponDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCanUseCouponDt.java
deleted file mode 100644
index 3e4ba5f..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCanUseCouponDt.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.hz.phis.dt.user.coupon;
-
-
-import com.hz.his.dto.PageDto;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**鐢ㄦ埛鍙敤浼樻儬鍒告墿灞�*/
-public class UserCanUseCouponDt extends PageDto {
- /**鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**婊¤冻閲戦*/
- private BigDecimal total;
- /**婊¤冻浠舵暟*/
- private Integer itemNum;
- /**鍟嗗搧瀵瑰簲鐨刪is鏍囪瘑*/
- private List<HisGoodsDt> hisGoodsDtList;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public BigDecimal getTotal() {
- return total;
- }
-
- public void setTotal(BigDecimal total) {
- this.total = total;
- }
-
- public Integer getItemNum() {
- return itemNum;
- }
-
- public void setItemNum(Integer itemNum) {
- this.itemNum = itemNum;
- }
-
- public List<HisGoodsDt> getHisGoodsDtList() {
- return hisGoodsDtList;
- }
-
- public void setHisGoodsDtList(List<HisGoodsDt> hisGoodsDtList) {
- this.hisGoodsDtList = hisGoodsDtList;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCouponDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCouponDt.java
deleted file mode 100644
index 26374f4..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/coupon/UserCouponDt.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.hz.phis.dt.user.coupon;
-
-
-import com.hz.his.dto.PageDto;
-
-/**鐢ㄦ埛浼樻儬鍒告墿灞�*/
-public class UserCouponDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**鏈夋晥鐘舵�侊細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 String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public Integer getValidState() {
- return validState;
- }
-
- public void setValidState(Integer validState) {
- this.validState = validState;
- }
-
- public String getCommonType() {
- return commonType;
- }
-
- public void setCommonType(String commonType) {
- this.commonType = commonType;
- }
-
- public String getCommonId() {
- return commonId;
- }
-
- public void setCommonId(String commonId) {
- this.commonId = commonId;
- }
-
- public String getCommonItemId() {
- return commonItemId;
- }
-
- public void setCommonItemId(String commonItemId) {
- this.commonItemId = commonItemId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-
- public String getUserCouponId() {
- return userCouponId;
- }
-
- public void setUserCouponId(String userCouponId) {
- this.userCouponId = userCouponId;
- }
-
- public Integer getIsUse() {
- return isUse;
- }
-
- public void setIsUse(Integer isUse) {
- this.isUse = isUse;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java
deleted file mode 100644
index 3e06a64..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.hz.phis.dt.user.money;
-
-import com.hz.his.dto.PageDto;
-
-/**鐢ㄦ埛娑堣垂*/
-public class UserConsumeDt extends PageDto {
-
- /**鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**閲戦绫诲瀷*/
- private Integer type;
- /**鎿嶄綔绫诲瀷*/
- private Integer opType;
-
- /**閲戦绫诲瀷-鍌ㄥ�奸噾*/
- public static final int TYPE_STORED_VALUE_FUND = 0;
- /**閲戦绫诲瀷-澧炲�奸噾*/
- public static final int TYPE_VALUE_ADDED_FUND = 1;
- /**閲戦绫诲瀷-绉垎*/
- public static final int TYPE_INTEGRAL = 2;
- /**閲戦绫诲瀷-棰勫畾閲�*/
- public static final int TYPE_DEPOSIT = 3;
-
- /**鎿嶄綔绫诲瀷-澧炲姞*/
- public static final int OP_TYPE_INCREASE = 1;
- /**鎿嶄綔绫诲瀷-鍑忓皯*/
- public static final int OP_TYPE_REDUCE = 2;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getOpType() {
- return opType;
- }
-
- public void setOpType(Integer opType) {
- this.opType = opType;
- }
-
-
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIncrementDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIncrementDt.java
deleted file mode 100644
index 9015d42..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIncrementDt.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.hz.phis.dt.user.money;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛澧炲�奸噾鍒楄〃
- * @author fwq
- * */
-public class UserIncrementDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**璁㈠崟id*/
- private String orderId;
- /**璁㈠崟鍙�*/
- private String orderNo;
- /**璁㈠崟瀛愭爣璇�*/
- private String orderItemId;
- /**瀛愯鍗曞彿*/
- private String orderItemNo;
- /**璁㈠崟绫诲瀷*/
- private String orderType;
-
-
- /**璁板綍鏍囪瘑*/
- private String recordId;
- /**鎿嶄綔绫诲瀷*/
- private Integer opType;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getOrderItemId() {
- return orderItemId;
- }
-
- public void setOrderItemId(String orderItemId) {
- this.orderItemId = orderItemId;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-
- public String getOrderType() {
- return orderType;
- }
-
- public void setOrderType(String orderType) {
- this.orderType = orderType;
- }
-
- public String getRecordId() {
- return recordId;
- }
-
- public void setRecordId(String recordId) {
- this.recordId = recordId;
- }
-
- public Integer getOpType() {
- return opType;
- }
-
- public void setOpType(Integer opType) {
- this.opType = opType;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIntegralDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIntegralDt.java
deleted file mode 100644
index 956e643..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserIntegralDt.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.hz.phis.dt.user.money;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛澧炲�奸噾鍒楄〃
- * @author fwq
- * */
-public class UserIntegralDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**璁㈠崟id*/
- private String orderId;
- /**璁㈠崟鍙�*/
- private String orderNo;
- /**璁㈠崟瀛愭爣璇�*/
- private String orderItemId;
- /**瀛愯鍗曞彿*/
- private String orderItemNo;
- /**璁㈠崟绫诲瀷*/
- private String orderType;
-
-
- /**璁板綍鏍囪瘑*/
- private String recordId;
- /**鎿嶄綔绫诲瀷*/
- private Integer opType;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getOrderItemId() {
- return orderItemId;
- }
-
- public void setOrderItemId(String orderItemId) {
- this.orderItemId = orderItemId;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-
- public String getOrderType() {
- return orderType;
- }
-
- public void setOrderType(String orderType) {
- this.orderType = orderType;
- }
-
- public String getRecordId() {
- return recordId;
- }
-
- public void setRecordId(String recordId) {
- this.recordId = recordId;
- }
-
- public Integer getOpType() {
- return opType;
- }
-
- public void setOpType(Integer opType) {
- this.opType = opType;
- }
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserRechargeDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserRechargeDt.java
deleted file mode 100644
index bc07914..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserRechargeDt.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hz.phis.dt.user.money;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛鍌ㄥ�奸噾鍒楄〃
- * @author fwq
- * */
-public class UserRechargeDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**鎿嶄綔绫诲瀷*/
- private Integer opType;
- /**璁㈠崟id*/
- private String orderId;
- /**璁㈠崟鍙�*/
- private String orderNo;
- /**璁㈠崟瀛愭爣璇�*/
- private String orderItemId;
- /**瀛愯鍗曞彿*/
- private String orderItemNo;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public Integer getOpType() {
- return opType;
- }
-
- public void setOpType(Integer opType) {
- this.opType = opType;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getOrderItemId() {
- return orderItemId;
- }
-
- public void setOrderItemId(String orderItemId) {
- this.orderItemId = orderItemId;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-}
-
-
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectDt.java
deleted file mode 100644
index 1ff7048..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectDt.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.hz.phis.dt.user.project;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛椤圭洰鎵╁睍
- * @author fwq
- * */
-public class UserProjectDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**鍟嗗搧绫诲瀷锛歱roject椤圭洰goods鍟嗗搧card鍗￠」*/
- private String type;
- /**鍟嗗搧缂栧彿*/
- private String goodsNo;
- /**鍟嗗搧鏍囪瘑*/
- private String goodsId;
- /**鏈夋晥鐘舵��:1鏈夋晥2鏃犳晥3宸蹭娇鐢�4杩囨湡鏃犳晥5宸插彇娑�*/
- private Integer effectiveStatus;
- /**鐢ㄦ埛椤圭洰鏍囪瘑*/
- private String userProjectId;
- /**瀛愯鍗曟爣璇�*/
- private String orderItemId;
- /**瀛愯鍗曠紪鍙�*/
- private String orderItemNo;
- /**璁㈠崟鍙�*/
- private String orderId;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getGoodsNo() {
- return goodsNo;
- }
-
- public void setGoodsNo(String goodsNo) {
- this.goodsNo = goodsNo;
- }
-
- public String getGoodsId() {
- return goodsId;
- }
-
- public void setGoodsId(String goodsId) {
- this.goodsId = goodsId;
- }
-
- public Integer getEffectiveStatus() {
- return effectiveStatus;
- }
-
- public void setEffectiveStatus(Integer effectiveStatus) {
- this.effectiveStatus = effectiveStatus;
- }
-
- public String getUserProjectId() {
- return userProjectId;
- }
-
- public void setUserProjectId(String userProjectId) {
- this.userProjectId = userProjectId;
- }
-
- public String getOrderItemId() {
- return orderItemId;
- }
-
- public void setOrderItemId(String orderItemId) {
- this.orderItemId = orderItemId;
- }
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-}
-
-
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectUsedDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectUsedDt.java
deleted file mode 100644
index d6ac51c..0000000
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/project/UserProjectUsedDt.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hz.phis.dt.user.project;
-
-import com.hz.his.dto.PageDto;
-
-/**
- * 鐢ㄦ埛椤圭洰浣跨敤鎵╁睍
- * @author fwq
- * */
-public class UserProjectUsedDt extends PageDto {
- /**phis鐢ㄦ埛鏍囪瘑*/
- private String userId;
- /**瀛愯鍗曠紪鍙�*/
- private String orderItemNo;
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
-
- public String getOrderItemNo() {
- return orderItemNo;
- }
-
- public void setOrderItemNo(String orderItemNo) {
- this.orderItemNo = orderItemNo;
- }
-}
-
-
--
Gitblit v1.8.0