From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 07 十月 2023 10:46:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 16
phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java | 1
phis-feign/src/main/java/com/hz/his/feign/service/platform/quotation/SPhipQuotationService.java | 48
phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java | 34
phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java | 13
phis-feign/src/main/java/com/hz/his/constant/PayWay.java | 14
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 9
phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java | 14
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 7
phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java | 3
phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java | 40
phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java | 58
phis-download-feign/pom.xml | 63
phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java | 32
phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java | 51
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java | 22
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 3
phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java | 47
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java | 42
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java | 23
phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java | 16
phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java | 50
phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java | 14
phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java | 40
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java | 6
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java | 17
phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 11
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java | 30
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java | 744 ++++++++
phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java | 6
phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java | 18
phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java | 17
phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java | 61
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java | 16
phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java | 2
pom.xml | 9
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java | 26
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 38
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 5
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 8
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 17
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java | 96 +
phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java | 23
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 8
phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java | 22
phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java | 16
phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java | 38
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 13
phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java | 81
phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java | 14
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 576 ++++++
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java | 8
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 123 +
phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java | 37
phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java | 13
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 3
phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java | 44
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java | 39
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java | 28
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 6
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 8
phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java | 51
phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java | 17
phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java | 101 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java | 18
phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java | 135 +
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java | 528 ++---
phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java | 10
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java | 30
phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java | 33
phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java | 55
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 19
phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java | 13
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java | 13
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java | 22
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java | 53
phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java | 219 ++
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 10
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 7
phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java | 21
phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java | 44
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2
phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java | 21
phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java | 21
phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java | 13
phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java | 36
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 70
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java | 28
phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java | 32
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 7
phis-download-feign/.gitignore | 26
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 13
phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java | 22
phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java | 25
phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java | 8
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java | 29
/dev/null | 38
phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java | 25
phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemAssocDto.java | 20
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 7
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 28
phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java | 14
phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java | 74
phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java | 42
124 files changed, 4,624 insertions(+), 388 deletions(-)
diff --git a/phis-download-feign/.gitignore b/phis-download-feign/.gitignore
new file mode 100644
index 0000000..dfeef60
--- /dev/null
+++ b/phis-download-feign/.gitignore
@@ -0,0 +1,26 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.iml
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/target/
+/.idea/
diff --git a/phis-download-feign/pom.xml b/phis-download-feign/pom.xml
new file mode 100644
index 0000000..d1bd73a
--- /dev/null
+++ b/phis-download-feign/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.hz</groupId>
+ <artifactId>phis-download-feign</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>com.hz</groupId>
+ <artifactId>phis-service-feign</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>com.hx.gitee</groupId>
+ <artifactId>hx-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.ulisesbocchio</groupId>
+ <artifactId>jasypt-spring-boot-starter</artifactId>
+ </dependency>
+
+ <!--openfeign鐨勬敮鎸�-->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <!-- <finalName>cases_common</finalName>-->
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java
new file mode 100644
index 0000000..cd13f99
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DActivityDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 娲诲姩
+ **/
+@Data
+public class DActivityDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
new file mode 100644
index 0000000..e7b6a14
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -0,0 +1,34 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 瀵煎嚭棰勭害Dto
+ */
+@Data
+public class DAppointDto extends DCommonDto {
+
+ private String startTime;
+ private String endTime;
+ private String shopId;
+ private String doctorId;
+ private String keyWord;
+ private String corpUserName;
+ private String doctorName;
+ private String type;
+ private Integer orderType;
+ private Integer isMicApprove;
+ private String projectName;
+ private String userLevel;
+ private String field;
+ private String id;
+ private String userId;
+ private String roleId;
+ private String corpUserId;
+ private String createCuName;
+ private String channelType;
+ private String chatCorpName;
+ private String appType;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java
new file mode 100644
index 0000000..4499aac
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DCardDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍗￠」
+ **/
+@Data
+public class DCardDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java
new file mode 100644
index 0000000..49273d6
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DComplaintDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鎶曡瘔璁板綍
+ **/
+@Data
+public class DComplaintDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
new file mode 100644
index 0000000..bfc28ac
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
@@ -0,0 +1,96 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍜ㄨ璁板綍
+ **/
+@Data
+public class DConsultationDto extends DCommonDto {
+ // 璁板綍id 缁ф壙dto宸插瓨鍦�
+ private String id;
+
+ // 闂ㄥ簵/璇婃墍ID
+ private String shopId;
+ // 绉戝缂栫爜
+ private String departmentCode;
+ // 绉戝鍚嶇О
+ private String departmentName;
+
+ /**鍜ㄨ绫诲瀷*/
+ private Integer consultType;
+ // 鍜ㄨ鏂瑰紡浠ｇ爜 瀛楀吀琛�
+ private String methodCode;
+ // 鍜ㄨ鏂瑰紡鍚嶇О
+ private String methodCodeName;
+
+ // 鍜ㄨ椤圭洰 - ID鍒楄〃
+ private String neededProjectIds;
+ // 鎺ㄨ崘椤圭洰 - ID鍒楄〃
+ private String recommendedProjectIds;
+ // 鍏虫敞娲诲姩 - ID鍒楄〃
+ private String focusActivitiesIds;
+ // 娼滃湪椤圭洰 - ID鍒楄〃
+ private String potentialProjectIds;
+
+ // 鏈垚浜ゅ師鍥�
+ private String description;
+ // 鍜ㄨ鍐呭
+ private String content;
+ // 澶囨敞
+ private String remark;
+ // 鏄惁鎰挎剰涓婇棬
+ private Integer isCanCome = 0;
+ // 鏄惁鍒拌
+ private Integer isVisit = 0;
+ // 鏄惁浠樻
+ private Integer isPay = 0;
+ // 鏄惁鑽夌
+ private Integer isDraft = 0;
+
+ // 椤电爜
+ private Integer pageNum;
+ // 椤垫暟
+ private Integer pageSize;
+ // 鐢ㄦ埛鍚嶇О
+ private String userName;
+ // 鍛樺伐瑙掕壊
+ private String roleId;
+
+ // 鍜ㄨ甯�
+ private String hisCorpUserId;
+ // 鐢电綉鍜ㄨ甯�
+ private String internetCorpUserId;
+ // 瀹㈡湇
+ private String chatCorpUserId;
+ // 鍒涘缓浜�
+ private String createEmployeeId;
+ // 鍒涘缓浜洪儴闂�
+ private String createEmployeePartId;
+ // 鍏虫敞娲诲姩
+ private String focusActivityId;
+ // 鍜ㄨ椤圭洰
+ private String neededProjectTypeId;
+ // 娼滃湪椤圭洰
+ private String potentialProjectTypeId;
+ // 鎺ㄨ崘椤圭洰
+ private String recommendedProjectId;
+ // 瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+ private String channelsTypeId;
+ // 瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+ private String channelId;
+ // 瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+ private String channel2Id;
+ // 鍒拌绫诲瀷
+ private String recentVisitType;
+ // 鍒拌鐘舵��
+ private Integer recentVisitStatus;
+ // 鏄惁鎴愪氦
+ private Integer isMakeADeal;
+ // 瀹㈡埛鎴愪氦鏍囩
+ private String isMakeADealLabel;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
new file mode 100644
index 0000000..26cf3d1
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧-鑽搧
+ **/
+@Data
+public class DConsumablesDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java
new file mode 100644
index 0000000..12a02e2
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DCouponDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浼樻儬鍒哥爜
+ **/
+@Data
+public class DCouponDto extends DCommonDto {
+ private String couponId;
+ private Date startCollectionTime;
+ private Date endCollectionTime;
+ private Integer isUse;
+ private String couponCostDepartment;
+ private Integer isReceive;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
new file mode 100644
index 0000000..e2ea779
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeductionDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎵ц璁板綍
+ **/
+@Data
+public class DDeductionDto extends DCommonDto {
+ private Integer status;
+ private String shopId;
+ private String departmentCode;
+ private String projectName;
+ private String hisProjectName;
+ private Integer drugsType;
+ private String userId;
+ private String roleId;
+ private String recordNo;
+ private String treatSingleNo;
+ private String belongDoctor;
+ private String belongNurse;
+ private String belongAdviser;
+ private String userShopId;
+ private String deShopId;
+ private Date startRescindedTime;
+ private Date endRescindedTime;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
new file mode 100644
index 0000000..c562660
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDeviceDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 璁惧
+ **/
+@Data
+public class DDeviceDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java
new file mode 100644
index 0000000..be59c9a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DDoctorTimeDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍖荤敓鎺掔彮
+ * @USER: fhx
+ * @DATE: 2023/9/19
+ **/
+@Data
+public class DDoctorTimeDto extends DCommonDto {
+
+ private String shopId;
+ private String monthStr;
+ private String doctorId;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
new file mode 100644
index 0000000..4270eba
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 瀵煎嚭鍛樺伐Dto
+ */
+@Data
+public class DEmployeeDto extends DCommonDto {
+ private Integer isJob;
+ private Integer isPerformanceEmp;
+ private String roleUniqueStr;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
new file mode 100644
index 0000000..3759f6d
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DFirstTreatCardDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒濊瘖鍗�
+ **/
+@Data
+public class DFirstTreatCardDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java
new file mode 100644
index 0000000..40749ec
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DMedicalRecordDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢靛瓙鐥呭巻
+ **/
+@Data
+public class DMedicalRecordDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
new file mode 100644
index 0000000..ee67f2a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DMoneyLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閲戦鍙樺姩
+ **/
+@Data
+public class DMoneyLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
new file mode 100644
index 0000000..0ad3d11
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
@@ -0,0 +1,47 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 璁㈠崟
+ **/
+@Data
+public class DOrderDto extends DCommonDto {
+
+ private Integer status;
+ private String orderNo;
+ private String type;
+ private Integer owe;
+ private String projectName;
+ private String operationName;
+ private String developerName;
+ private String employeeName;
+ private String phisOrderNo;
+ private String prescriptionNo;
+ private String appIdCode;
+ private String sourceName;
+ private String sourceOrderNo;
+ private Integer applyStatus;
+ private Integer payStatus;
+ private Integer refundStatus;
+ private Integer isCustomerConfirm;
+ private Integer isOldBringNew;
+ private Integer isBothTheOne;
+ private String channelName;
+ private String inviteeName;
+ private String userInviteeName;
+ private String userChannelName;
+ private String shopName;
+ private String departmentName;
+ private String doctorName;
+ private String hisCorpUserName;
+ private String userName;
+ private String shopIds;
+ private String roleUniqueStr;
+ private String userStatus;
+ private String userLevel;
+ private String internetCorpUserId;
+ private String internetCorpUserName;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
new file mode 100644
index 0000000..26aa136
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPayDetailDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鏀舵鏄庣粏
+ **/
+@Data
+public class DPayDetailDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java
new file mode 100644
index 0000000..f3cd89f
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPrescriptionDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢靛瓙澶勬柟
+ **/
+@Data
+public class DPrescriptionDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
new file mode 100644
index 0000000..a9ab21b
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DProjectSkuDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 椤圭洰SKU
+ **/
+@Data
+public class DProjectSkuDto extends DCommonDto {
+
+ private String name;
+ private Integer enable;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java
new file mode 100644
index 0000000..ee9699f
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DPromotionDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 淇冮攢
+ **/
+@Data
+public class DPromotionDto extends DCommonDto {
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
new file mode 100644
index 0000000..02f894e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DRefundDto.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閫�娆惧崟
+ **/
+@Data
+public class DRefundDto extends DCommonDto {
+
+ private String shopId;
+ private String sourceType;
+ private Integer status;
+ private String roleId;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
new file mode 100644
index 0000000..8acb3ab
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DReturnVisitDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒拌璁板綍
+ **/
+@Data
+public class DReturnVisitDto extends DCommonDto {
+
+ private String userId;
+ private Date planStartTime;
+ private Date planEndTime;
+ private Date returnVisitStartTime;
+ private Date returnVisitEndTime;
+ private Date doneStartTime;
+ private Date doneEndTime;
+ private String returnVisitType;
+ private String returnVisitPlan;
+ private String returnVisitMethod;
+ private Integer returnVisitStatus;
+ private Integer doneStatus;
+ private Integer timeoutStatus;
+ private Integer visitResultStatus;
+ private Integer satisfiedStatus;
+ private String shopId;
+ private String roleId;
+ private String createPersonName;
+ private String channelType;
+ private String createPersonId;
+ private String visitPersonId;
+ private String corpId;
+ private String corpName;
+ private String shopIds;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
new file mode 100644
index 0000000..f733adc
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTelLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 閫氳瘽璁板綍鍙樺姩
+ **/
+@Data
+public class DTelLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
new file mode 100644
index 0000000..2460d9a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTreatSingleDto.java
@@ -0,0 +1,40 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 娌荤枟鍗�
+ **/
+@Data
+public class DTreatSingleDto extends DCommonDto {
+
+ //鐢ㄦ埛id
+ private String userId;
+ //绫诲瀷
+ private Integer type;
+ //娌荤枟鍗曞彿
+ private String treatSingleNo;
+ //鎿嶄綔浜�
+ private String operatorName;
+ //鎶ゅ＋鍚嶇О
+ private String nurseName;
+ //鍖荤敓鍚嶇О
+ private String doctorName;
+ //鏄惁鍒掓墸
+ private Integer isDeduct;
+ //鍒涘缓鏃堕棿
+ private String createTime;
+ //闂ㄥ簵id
+ private String shopId;
+ //鏄惁鍒嗛厤娌荤枟
+ private Integer isPerTreat;
+ //鍒拌璁㈠崟id
+ private String visitOrderId;
+ //闂ㄥ簵id
+ private List<String> shopIdList;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java
new file mode 100644
index 0000000..7d8a1ca
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DTurnDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 杞禒
+ **/
+@Data
+public class DTurnDto extends DCommonDto {
+
+ // 杞浜洪棬搴梚d
+ private String shopId;
+ // 杞浜篿d
+ private String turnId;
+ // 杞浜�
+ private String giveAway;
+ // 鍙楄禒浜篿d
+ private String doneeId;
+ // 鍙楄禒浜�
+ private String donated;
+ // 瑙掕壊id
+ private String roleId;
+ // 绫诲瀷
+ private String type;
+ //鍙楄禒浜洪棬搴桰D
+ private String doneeShopId;
+ //璁㈠崟鍙�
+ private String orderNo;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
new file mode 100644
index 0000000..f2c2090
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒拌璁㈠崟(瀵煎尰)
+ **/
+@Data
+public class DVisitOrderDto extends DCommonDto {
+
+ private String doctorName;
+ private String userName;
+ private String adviserName;
+ private String nurseName;
+ private String shopId;
+ private String status;
+
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
new file mode 100644
index 0000000..6b7d18e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitRecordDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鍒拌璁板綍
+ **/
+@Data
+public class DVisitRecordDto extends DCommonDto {
+
+ private String shopId;
+ private String preTypeName;
+ private String doctorName;
+ private String nurseName;
+ private String adviserName;
+ private Integer status;
+ private String inShopSql;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
new file mode 100644
index 0000000..a136d67
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
@@ -0,0 +1,51 @@
+package com.hz.his.dto.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ */
+@Data
+public class DCommonDto {
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operateMan;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜鸿鑹叉爣璇�(EmployeeRole)*/
+ private String opRoleId;
+ /**鎿嶄綔浜鸿鑹插瓧绗︿覆*/
+ private String opRoleStr;
+ /**鎿嶄綔浜鸿鑹插悕绉�*/
+ private String opRoleName;
+ /**澶囨敞*/
+ private String opRemark;
+
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+ /**鎼滅储鍏抽敭瀛�*/
+ private String searchData;
+ /**鎼滅储鍏抽敭瀛�*/
+ private String keyWord;
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
+ private String userKeyWord;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private List<String> userIdList;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java
new file mode 100644
index 0000000..d2a6360
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java
@@ -0,0 +1,101 @@
+package com.hz.his.dto.common;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ChenJiaHe
+ * 鍒嗛〉鎵╁睍绫�*/
+@Data
+public class PageDto {
+ /**鏍囪瘑*/
+ private String id;
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize;
+ /**鍏抽敭瀛�*/
+ private String keyWord;
+ /**涓婄骇鏍囪瘑*/
+ private String parentId;
+ /**鍒嗙被鏍囪瘑*/
+ private String typeId;
+ private List<String> typeIdList;
+ //appid
+ private String appId;
+
+
+ public Integer getPageNum() {
+ if(this.pageNum == null || this.pageNum < 0){
+ this.pageNum = 1;
+ }
+ return this.pageNum;
+ }
+
+ public Integer getPageNum(Integer pageNum) {
+ if(pageNum != null){
+ this.pageNum = pageNum;
+ }else{
+ this.pageNum = getPageNum();
+ }
+ return this.pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
+ this.pageSize = 800;
+ }
+ return this.pageSize;
+ }
+
+ public Integer getPageSize(Integer pageSize) {
+ if(pageSize != null){
+ this.pageSize = pageSize;
+ }else{
+ this.pageSize = getPageSize();
+ }
+ return this.pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java
new file mode 100644
index 0000000..af7e94e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserChangeLogDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.user;
+
+
+import com.hz.his.dto.common.DCommonDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛璁板綍鍙樺姩
+ **/
+@Data
+public class DUserChangeLogDto extends DCommonDto {
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
new file mode 100644
index 0000000..a042d2e
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserDto.java
@@ -0,0 +1,744 @@
+package com.hz.his.dto.user;
+
+
+import com.hz.his.dto.common.DCommonDto;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛
+ **/
+public class DUserDto{
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operateMan;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜鸿鑹叉爣璇�(EmployeeRole)*/
+ private String opRoleId;
+ /**鎿嶄綔浜鸿鑹插瓧绗︿覆*/
+ private String opRoleStr;
+ /**鎿嶄綔浜鸿鑹插悕绉�*/
+ private String opRoleName;
+ /**澶囨敞*/
+ private String opRemark;
+
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+ /**鎼滅储鍏抽敭瀛�*/
+ private String searchData;
+ /**鎼滅储鍏抽敭瀛�*/
+ private String keyWord;
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
+ private String userKeyWord;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private List<String> userIdList;
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
+ private List<DUserTagDto> userTagInfo;
+
+ private Integer appType;
+
+ private String userStatus;
+ private String hisCorpUserId;
+ private String hisCorpUserName;
+ private String shopId;
+ private String shopName;
+
+ private String cIq;
+
+ private String cStartTime;
+ private String cEndTime;
+
+ private String userLevel;
+
+ private String startBirthDay;
+ private String endBirthDay;
+
+ private String creator;
+
+ private String userType;
+
+
+
+ private Integer gender;
+
+ private Integer startAge;
+ private Integer endAge;
+
+ private String channelType;
+ private String channelId;
+
+ private String cuName;
+
+ private String userRole;
+
+ private String startReturnVisitTime;
+ private String endReturnVisitTime;
+
+ private String startFirstTime;
+ private String endFirstTime;
+
+ private String startlatelyTime;
+ private String endlatelyTime;
+
+ private String startFirstPayTime;
+ private String endFirstPayTime;
+
+ private String startLastPayTime;
+ private String endLastPayTime;
+
+ private Integer isComeShop;
+
+ private Integer isConsume;
+
+ private Integer isBindCRMTime;
+
+ private Integer isBindSTTime;
+
+ private Integer isBindGZHTime;
+
+ private String country;
+ private String province;
+ private String city;
+ private String area;
+
+ private String inviteeId;
+ private String inviteeName;
+
+ private String tmkName;
+ private String doctorNme;
+
+ private String noBugProject;
+ private String bugProject;
+ private String executeProjectType;
+ private String bugProjectType;
+
+ private String consultationProject;
+ private String consultationProjectType;
+
+ private String notUseProject;
+
+ private String userCardName;
+
+ private Integer expectedLossDay;
+
+ private Integer isPretriageCard;
+
+ private String indication1;
+ private String indication2;
+ private Integer indicationLevel;
+
+
+ public String getOperateId() {
+ return operateId;
+ }
+
+ public void setOperateId(String operateId) {
+ this.operateId = operateId;
+ }
+
+ public String getOperateMan() {
+ return operateMan;
+ }
+
+ public void setOperateMan(String operateMan) {
+ this.operateMan = operateMan;
+ }
+
+ public String getOpShopId() {
+ return opShopId;
+ }
+
+ public void setOpShopId(String opShopId) {
+ this.opShopId = opShopId;
+ }
+
+ public String getOpShopName() {
+ return opShopName;
+ }
+
+ public void setOpShopName(String opShopName) {
+ this.opShopName = opShopName;
+ }
+
+ public String getOpRoleId() {
+ return opRoleId;
+ }
+
+ public void setOpRoleId(String opRoleId) {
+ this.opRoleId = opRoleId;
+ }
+
+ public String getOpRoleStr() {
+ return opRoleStr;
+ }
+
+ public void setOpRoleStr(String opRoleStr) {
+ this.opRoleStr = opRoleStr;
+ }
+
+ public String getOpRoleName() {
+ return opRoleName;
+ }
+
+ public void setOpRoleName(String opRoleName) {
+ this.opRoleName = opRoleName;
+ }
+
+ public String getOpRemark() {
+ return opRemark;
+ }
+
+ public void setOpRemark(String opRemark) {
+ this.opRemark = opRemark;
+ }
+
+ 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 getSearchData() {
+ return searchData;
+ }
+
+ public void setSearchData(String searchData) {
+ this.searchData = searchData;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserKeyWord() {
+ return userKeyWord;
+ }
+
+ public void setUserKeyWord(String userKeyWord) {
+ this.userKeyWord = userKeyWord;
+ }
+
+ public List<String> getUserIdList() {
+ return userIdList;
+ }
+
+ public void setUserIdList(List<String> userIdList) {
+ this.userIdList = userIdList;
+ }
+
+ public List<String> getShopIdList() {
+ return shopIdList;
+ }
+
+ public void setShopIdList(List<String> shopIdList) {
+ this.shopIdList = shopIdList;
+ }
+
+ public List<String> getEmployeeIdList() {
+ return employeeIdList;
+ }
+
+ public void setEmployeeIdList(List<String> employeeIdList) {
+ this.employeeIdList = employeeIdList;
+ }
+
+ public List<DUserTagDto> getUserTagInfo() {
+ return userTagInfo;
+ }
+
+ public void setUserTagInfo(List<DUserTagDto> userTagInfo) {
+ this.userTagInfo = userTagInfo;
+ }
+
+ public Integer getAppType() {
+ return appType;
+ }
+
+ public void setAppType(Integer appType) {
+ this.appType = appType;
+ }
+
+ public String getUserStatus() {
+ return userStatus;
+ }
+
+ public void setUserStatus(String userStatus) {
+ this.userStatus = userStatus;
+ }
+
+ public String getHisCorpUserId() {
+ return hisCorpUserId;
+ }
+
+ public void setHisCorpUserId(String hisCorpUserId) {
+ this.hisCorpUserId = hisCorpUserId;
+ }
+
+ public String getHisCorpUserName() {
+ return hisCorpUserName;
+ }
+
+ public void setHisCorpUserName(String hisCorpUserName) {
+ this.hisCorpUserName = hisCorpUserName;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getcIq() {
+ return cIq;
+ }
+
+ public void setcIq(String cIq) {
+ this.cIq = cIq;
+ }
+
+ public String getcStartTime() {
+ return cStartTime;
+ }
+
+ public void setcStartTime(String cStartTime) {
+ this.cStartTime = cStartTime;
+ }
+
+ public String getcEndTime() {
+ return cEndTime;
+ }
+
+ public void setcEndTime(String cEndTime) {
+ this.cEndTime = cEndTime;
+ }
+
+ public String getUserLevel() {
+ return userLevel;
+ }
+
+ public void setUserLevel(String userLevel) {
+ this.userLevel = userLevel;
+ }
+
+ public String getStartBirthDay() {
+ return startBirthDay;
+ }
+
+ public void setStartBirthDay(String startBirthDay) {
+ this.startBirthDay = startBirthDay;
+ }
+
+ public String getEndBirthDay() {
+ return endBirthDay;
+ }
+
+ public void setEndBirthDay(String endBirthDay) {
+ this.endBirthDay = endBirthDay;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+
+ public Integer getGender() {
+ return gender;
+ }
+
+ public void setGender(Integer gender) {
+ this.gender = gender;
+ }
+
+ public Integer getStartAge() {
+ return startAge;
+ }
+
+ public void setStartAge(Integer startAge) {
+ this.startAge = startAge;
+ }
+
+ public Integer getEndAge() {
+ return endAge;
+ }
+
+ public void setEndAge(Integer endAge) {
+ this.endAge = endAge;
+ }
+
+ public String getChannelType() {
+ return channelType;
+ }
+
+ public void setChannelType(String channelType) {
+ this.channelType = channelType;
+ }
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getCuName() {
+ return cuName;
+ }
+
+ public void setCuName(String cuName) {
+ this.cuName = cuName;
+ }
+
+ public String getUserRole() {
+ return userRole;
+ }
+
+ public void setUserRole(String userRole) {
+ this.userRole = userRole;
+ }
+
+ public String getStartReturnVisitTime() {
+ return startReturnVisitTime;
+ }
+
+ public void setStartReturnVisitTime(String startReturnVisitTime) {
+ this.startReturnVisitTime = startReturnVisitTime;
+ }
+
+ public String getEndReturnVisitTime() {
+ return endReturnVisitTime;
+ }
+
+ public void setEndReturnVisitTime(String endReturnVisitTime) {
+ this.endReturnVisitTime = endReturnVisitTime;
+ }
+
+ public String getStartFirstTime() {
+ return startFirstTime;
+ }
+
+ public void setStartFirstTime(String startFirstTime) {
+ this.startFirstTime = startFirstTime;
+ }
+
+ public String getEndFirstTime() {
+ return endFirstTime;
+ }
+
+ public void setEndFirstTime(String endFirstTime) {
+ this.endFirstTime = endFirstTime;
+ }
+
+ public String getStartlatelyTime() {
+ return startlatelyTime;
+ }
+
+ public void setStartlatelyTime(String startlatelyTime) {
+ this.startlatelyTime = startlatelyTime;
+ }
+
+ public String getEndlatelyTime() {
+ return endlatelyTime;
+ }
+
+ public void setEndlatelyTime(String endlatelyTime) {
+ this.endlatelyTime = endlatelyTime;
+ }
+
+ public String getStartFirstPayTime() {
+ return startFirstPayTime;
+ }
+
+ public void setStartFirstPayTime(String startFirstPayTime) {
+ this.startFirstPayTime = startFirstPayTime;
+ }
+
+ public String getEndFirstPayTime() {
+ return endFirstPayTime;
+ }
+
+ public void setEndFirstPayTime(String endFirstPayTime) {
+ this.endFirstPayTime = endFirstPayTime;
+ }
+
+ public String getStartLastPayTime() {
+ return startLastPayTime;
+ }
+
+ public void setStartLastPayTime(String startLastPayTime) {
+ this.startLastPayTime = startLastPayTime;
+ }
+
+ public String getEndLastPayTime() {
+ return endLastPayTime;
+ }
+
+ public void setEndLastPayTime(String endLastPayTime) {
+ this.endLastPayTime = endLastPayTime;
+ }
+
+ public Integer getIsComeShop() {
+ return isComeShop;
+ }
+
+ public void setIsComeShop(Integer isComeShop) {
+ this.isComeShop = isComeShop;
+ }
+
+ public Integer getIsConsume() {
+ return isConsume;
+ }
+
+ public void setIsConsume(Integer isConsume) {
+ this.isConsume = isConsume;
+ }
+
+ public Integer getIsBindCRMTime() {
+ return isBindCRMTime;
+ }
+
+ public void setIsBindCRMTime(Integer isBindCRMTime) {
+ this.isBindCRMTime = isBindCRMTime;
+ }
+
+ public Integer getIsBindSTTime() {
+ return isBindSTTime;
+ }
+
+ public void setIsBindSTTime(Integer isBindSTTime) {
+ this.isBindSTTime = isBindSTTime;
+ }
+
+ public Integer getIsBindGZHTime() {
+ return isBindGZHTime;
+ }
+
+ public void setIsBindGZHTime(Integer isBindGZHTime) {
+ this.isBindGZHTime = isBindGZHTime;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ 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 getInviteeId() {
+ return inviteeId;
+ }
+
+ public void setInviteeId(String inviteeId) {
+ this.inviteeId = inviteeId;
+ }
+
+ public String getInviteeName() {
+ return inviteeName;
+ }
+
+ public void setInviteeName(String inviteeName) {
+ this.inviteeName = inviteeName;
+ }
+
+ public String getTmkName() {
+ return tmkName;
+ }
+
+ public void setTmkName(String tmkName) {
+ this.tmkName = tmkName;
+ }
+
+ public String getDoctorNme() {
+ return doctorNme;
+ }
+
+ public void setDoctorNme(String doctorNme) {
+ this.doctorNme = doctorNme;
+ }
+
+ public String getNoBugProject() {
+ return noBugProject;
+ }
+
+ public void setNoBugProject(String noBugProject) {
+ this.noBugProject = noBugProject;
+ }
+
+ public String getBugProject() {
+ return bugProject;
+ }
+
+ public void setBugProject(String bugProject) {
+ this.bugProject = bugProject;
+ }
+
+ public String getExecuteProjectType() {
+ return executeProjectType;
+ }
+
+ public void setExecuteProjectType(String executeProjectType) {
+ this.executeProjectType = executeProjectType;
+ }
+
+ public String getBugProjectType() {
+ return bugProjectType;
+ }
+
+ public void setBugProjectType(String bugProjectType) {
+ this.bugProjectType = bugProjectType;
+ }
+
+ public String getConsultationProject() {
+ return consultationProject;
+ }
+
+ public void setConsultationProject(String consultationProject) {
+ this.consultationProject = consultationProject;
+ }
+
+ public String getConsultationProjectType() {
+ return consultationProjectType;
+ }
+
+ public void setConsultationProjectType(String consultationProjectType) {
+ this.consultationProjectType = consultationProjectType;
+ }
+
+ public String getNotUseProject() {
+ return notUseProject;
+ }
+
+ public void setNotUseProject(String notUseProject) {
+ this.notUseProject = notUseProject;
+ }
+
+ public String getUserCardName() {
+ return userCardName;
+ }
+
+ public void setUserCardName(String userCardName) {
+ this.userCardName = userCardName;
+ }
+
+ public Integer getExpectedLossDay() {
+ return expectedLossDay;
+ }
+
+ public void setExpectedLossDay(Integer expectedLossDay) {
+ this.expectedLossDay = expectedLossDay;
+ }
+
+ public Integer getIsPretriageCard() {
+ return isPretriageCard;
+ }
+
+ public void setIsPretriageCard(Integer isPretriageCard) {
+ this.isPretriageCard = isPretriageCard;
+ }
+
+ public String getIndication1() {
+ return indication1;
+ }
+
+ public void setIndication1(String indication1) {
+ this.indication1 = indication1;
+ }
+
+ public String getIndication2() {
+ return indication2;
+ }
+
+ public void setIndication2(String indication2) {
+ this.indication2 = indication2;
+ }
+
+ public Integer getIndicationLevel() {
+ return indicationLevel;
+ }
+
+ public void setIndicationLevel(Integer indicationLevel) {
+ this.indicationLevel = indicationLevel;
+ }
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java
new file mode 100644
index 0000000..67fab6d
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/user/DUserTagDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.user;
+
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛
+ **/
+@Data
+public class DUserTagDto {
+ private String tagName;
+ private String tagTypeId;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
new file mode 100644
index 0000000..53985c7
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/feign/download/DFileDownloadService.java
@@ -0,0 +1,135 @@
+package com.hz.his.feign.download;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.*;
+import com.hz.his.dto.user.DUserChangeLogDto;
+import com.hz.his.dto.user.DUserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * PHIS-涓嬭浇涓績
+ */
+@FeignClient(name="phi-download-service",path = "/phis-download",contextId = "d-phi-download")
+public interface DFileDownloadService {
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害鏁版嵁*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍖荤敓鎺掔彮*/
+
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒�*/
+ @PostMapping(value = "/report/export/coupon/list")
+ Result exportCoupon(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-浼樻儬鍒哥爜*/
+ @PostMapping(value = "/report/export/coupon/number/list")
+ Result exportCouponNumber(@RequestBody DCouponDto dCouponDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒掓墸璁板綍*/
+ @PostMapping(value = "/report/export/deduction/list")
+ Result exportDeduction(@RequestBody DDeductionDto dDeductionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/list")
+ Result exportEmployee(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍛樺伐瑙掕壊鏁版嵁*/
+ @PostMapping(value = "/report/export/employee/role/list")
+ Result exportEmployeeRole(@RequestBody DEmployeeDto dEmployeeDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-姒傝璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/list")
+ Result exportOrder(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏄庣粏璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/detail/list")
+ Result exportOrderDetail(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鑽璁㈠崟鏁版嵁*/
+ @PostMapping(value = "/report/export/order/drug/list")
+ Result exportOrderDrug(@RequestBody DOrderDto dOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鏀舵璁板綍*/
+ @PostMapping(value = "/report/export/pay/detail/list")
+ Result exportPayDetail(@RequestBody DPayDetailDto dPayDetailDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰鍒嗙被*/
+ @PostMapping(value = "/report/export/project/type/list")
+ Result exportProjectType(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SKU*/
+ @PostMapping(value = "/report/export/project/sku/list")
+ Result exportProjectSku(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤圭洰SPU*/
+ @PostMapping(value = "/report/export/project/spu/list")
+ Result exportProjectSpu(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-棰勭害椤圭洰*/
+ @PostMapping(value = "/report/export/project/sku/appoint/list")
+ Result exportProjectSkuAppoint(@RequestBody DProjectSkuDto dProjectSkuDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫�娆捐褰�*/
+ @PostMapping(value = "/report/export/refund/list")
+ Result exportRefund(@RequestBody DRefundDto dRefundDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娌荤枟閫氱煡鍗�*/
+ @PostMapping(value = "/report/export/treat/list")
+ Result exportTreat(@RequestBody DTreatSingleDto dTreatSingleDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-瀵煎尰璁㈠崟*/
+ @PostMapping(value = "/report/export/guide/visit/order/list")
+ Result exportGuideOrder(@RequestBody DVisitOrderDto dVisitOrderDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒拌璁板綍*/
+ @PostMapping(value = "/report/export/visit/record/list")
+ Result exportVisitRecord(@RequestBody DVisitRecordDto dVisitRecordDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍥炶璁板綍*/
+ @PostMapping(value = "/report/export/return/visit/list")
+ Result exportReturnVisit(@RequestBody DReturnVisitDto dReturnVisitDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍒濊瘖鍗′俊鎭�*/
+ @PostMapping(value = "/report/export/user/first/treat/card/list")
+ Result exportFirstTreatCard(@RequestBody DFirstTreatCardDto dFirstTreatCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-璁惧*/
+ @PostMapping(value = "/report/export/device/list")
+ Result exportDevice(@RequestBody DDeviceDto dDeviceDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍌ㄥ�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/store/list")
+ Result exportStore(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-澧炲�奸噾鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/increment/list")
+ Result exportIncrement(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绉垎鍙樺姩璁板綍*/
+ @PostMapping(value = "/report/export/money/log/integral/list")
+ Result exportIntegral(@RequestBody DMoneyLogDto dMoneyLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-閫氳瘽璁板綍*/
+ @PostMapping(value = "/report/export/tel/log/list")
+ Result exportTelLog(@RequestBody DTelLogDto dTelLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-绛夌骇鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/level/list")
+ Result exportLevelChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-椤鹃棶鍙樺寲*/
+ @PostMapping(value = "/report/export/user/change/log/adviser/list")
+ Result exportAdviserChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐘舵�佸彉鍖�*/
+ @PostMapping(value = "/report/export/user/change/log/status/list")
+ Result exportStatusChange(@RequestBody DUserChangeLogDto dUserChangeLogDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鎶曡瘔璁板綍*/
+ @PostMapping(value = "/report/export/complaint/list")
+ Result exportComplaint(@RequestBody DComplaintDto dComplaintDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍜ㄨ璁板綍*/
+ @PostMapping(value = "/report/export/consultation/list")
+ Result exportConsultation(@RequestBody DConsultationDto dConsultationDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-淇冮攢*/
+ @PostMapping(value = "/report/export/promotion/list")
+ Result exportPromotion(@RequestBody DPromotionDto dPromotionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍗￠」*/
+ @PostMapping(value = "/report/export/card/list")
+ Result exportCard(@RequestBody DCardDto dCardDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-娲诲姩*/
+ @PostMapping(value = "/report/export/activity/list")
+ Result exportActivity(@RequestBody DActivityDto dActivityDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢ㄦ埛鏁版嵁*/
+ @PostMapping(value = "/report/export/user/list")
+ Result exportUser(@RequestBody DUserDto dUserDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-杞禒鏁版嵁*/
+ @PostMapping(value = "/report/export/user/turn/list")
+ Result exportTurn(@RequestBody DTurnDto dTurnDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鍟嗗搧-鑽搧鏁版嵁*/
+ @PostMapping(value = "/report/export/consumables/list")
+ Result exportConsumables(@RequestBody DConsumablesDto dConsumablesDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙澶勬柟*/
+ @PostMapping(value = "/report/export/treat/prescription/list")
+ Result exportPrescription(@RequestBody DPrescriptionDto dPrescriptionDto);
+ /**瀵煎嚭绫诲瀷-搴曡〃-鐢靛瓙鐥呭巻*/
+ @PostMapping(value = "/report/export/treat/medical/list")
+ Result exportMedical(@RequestBody DMedicalRecordDto dMedicalRecordDto);
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/constant/PayWay.java b/phis-feign/src/main/java/com/hz/his/constant/PayWay.java
new file mode 100644
index 0000000..4f642ac
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/constant/PayWay.java
@@ -0,0 +1,14 @@
+package com.hz.his.constant;
+
+/**鏀粯鏂瑰紡*/
+public class PayWay {
+
+ /**浜ゆ槗鏂瑰紡-寰俊*/
+ public static final String PAY_WAY_WECHAT = "WECHAT";
+ /**浜ゆ槗鏂瑰紡-鏀粯瀹�*/
+ public static final String PAY_WAY_ALIPAY = "ALIPAY";
+ /**浜ゆ槗鏂瑰紡-閾惰仈*/
+ public static final String PAY_WAY_UNIONPAY = "UNIONPAY";
+ /**浜ゆ槗鏂瑰紡-鏁板瓧浜烘皯甯�*/
+ public static final String PAY_WAYE_EC = "EC";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
index d478951..effa337 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java
@@ -1,8 +1,14 @@
package com.hz.his.dto.activity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 闄愬埗
@@ -13,4 +19,8 @@
private String id;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+
+ private Date limitStartTime;
+
+ private Date limitEndTime;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java
new file mode 100644
index 0000000..8a6b6dd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java
@@ -0,0 +1,38 @@
+package com.hz.his.dto.activityData;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍗囧崟鎶ヨ〃dto
+ * @USER: fhx
+ * @DATE: 2023/9/25
+ **/
+@Data
+public class ActivityReportDto extends PageDto {
+
+ /** 鎶ュ憡id */
+ private String reportId;
+ /** 鐢ㄦ埛鍚� */
+ private String name;
+ /** 娓犻亾 */
+ private String channel;
+ /** 娓犻亾 */
+ private String channelName;
+ /** 娓犻亾 */
+ private String channelName2;
+ /** 钀ラ攢椤圭洰鍚嶇О */
+ private String marketProjectName;
+ /** 鍜ㄨ甯堝悕绉� */
+ private String consultName;
+ /** 鍖荤敓鍚嶇О */
+ private String doctorName;
+ //寮�濮嬫椂闂�
+ private String startTime;
+ //缁撴潫鏃堕棿
+ private String endTime;
+ /** 鎿嶄綔浜烘爣璇� */
+ private String operatorId;
+ /** 鎿嶄綔浜� */
+ private String operatorName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
index 8eb208c..d8eb62d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -35,6 +35,16 @@
/** 鍒拌璁㈠崟id(闂ㄥ簵鍔╂墜浣跨敤缁熻浣跨敤) */
private String visitOrderId;
+ /**鏁版嵁绫诲瀷(AppearanceConstants)*/
+ private Integer dataType;
+
+ /** 鐭湡瑙勫垝 */
+ private String shortPlan;
+ /** 涓湡瑙勫垝 */
+ private String middlePlan;
+ /** 闀挎湡瑙勫垝 */
+ private String longPlan;
+
public AppearanceDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
index 94725e4..afa12b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelDto.java
@@ -23,6 +23,8 @@
private String labelInfoName;
/**棰滆壊*/
private String color;
+ /** 鍏朵粬淇℃伅 */
+ private AppearanceLabelInfoDto labelInfo;
public AppearanceLabelDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java
new file mode 100644
index 0000000..c01085f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceLabelInfoDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.appearance;
+
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/8/29
+ **/
+@Data
+public class AppearanceLabelInfoDto {
+
+ /** 閫傚簲鐥囩▼搴�(0鏃�1杞�2涓�3閲�) */
+ private Integer indDegree;
+ /** 鍓傞噺鍗曚綅 */
+ private String doseUnit;
+ /** 寤鸿娌荤枟鍓傞噺 */
+ private String treatDose;
+ /** 椤圭洰璇夋眰鍒嗙被鏍囪瘑(AppealType) */
+ private String appealTypeId;
+ //鏍煎紡锛歔{'appealTypeId':'123', 'name':'鐧�', 'parentId':'123'},....]
+ /** 椤圭洰璇夋眰鍒嗙被鏁扮粍json */
+ private String appealTypeJson;
+
+ public AppearanceLabelInfoDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
new file mode 100644
index 0000000..c1df09a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -0,0 +1,576 @@
+package com.hz.his.dto.consultation;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 鍜ㄨ璁板綍dto 鏂扮増
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ConsultRecordDto{
+
+ //鐢ㄦ埛id
+ private String userId;
+ //闂ㄥ簵/璇婃墍ID
+ private String shopId;
+ //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=澶嶈瘖
+ private Integer consultType;
+ //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
+ private Integer satisfie;
+ //闈㈣瘖鍖荤敓id
+ private String faceDoctorId;
+ //娌荤枟鍖荤敓id
+ private String treatDoctorId;
+ //鍩烘湰淇℃伅
+ private String content;
+ //涓昏璇夋眰
+ private String appealDetail;
+ //娌荤枟鏂规&鎶ヤ环
+ private String treatPlanQuote;
+ //鍓傞噺鍙傛暟
+ private String dosageParams;
+ //鏃㈠線鐥呭彶
+ private String anamnesis;
+ //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
+ private String hasTreatProjects;
+ //鏄惁鑽夌 0=鍚� 1=鏄�
+ private Integer isDraft;
+ //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
+ private Integer adminType;
+ //鍒涘缓浜篿d
+ private String adminId;
+ //鍒涘缓浜哄悕绉�
+ private String adminName;
+ //闈㈣瘖鏂规
+ private String facePlan;
+ //鍒涘缓鏃堕棿
+ private Date createTime;
+ //鏈娌荤枟椤圭洰 澶氫釜閫楀彿鍒嗗壊
+ private String treatProjectIds;
+ //鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
+ private String recommendProjectIds;
+ //涓婃娌荤枟鍖荤敓ID
+ private String lastTreatDoctorId;
+ //涓婃娌荤枟椤圭洰json瀛楃涓� ["椤圭洰ID","椤圭洰ID"]
+ private String lastTreatProjects;
+ //鍜ㄨ鏂瑰紡浠ｇ爜
+ private String methodCode;
+ //鍜ㄨ鏂瑰紡鍚嶇О
+ private String methodCodeName;
+
+ //------------- 淇敼浼犲��
+ private String id;
+
+
+ //------------- 璇︽儏杩斿洖
+ //娌荤枟鍖荤敓鍚嶇О
+ private String faceDoctorName;
+ //娌荤枟鍖荤敓鍚嶇О
+ private String treatDoctorName;
+ //涓婃娌荤枟鍖荤敓鍚嶇О
+ private String lastTreatDoctorName;
+
+ //------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
+ //娌荤枟椤圭洰
+ private List<Map<String,Object>> treatProjectList;
+ //鎺ㄨ崘椤圭洰
+ private List<Map<String,Object>> recommendProjectList;
+ //涓婃娌荤枟椤圭洰
+ private List<Map<String,Object>> lastTreatProjectList;
+
+
+ //-------------- 鎼滅储鏉′欢
+ //灏忕▼搴忔悳绱㈡椂 鏈変釜椤甸潰鏄渶瑕佷紶鏃堕棿鐨�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String startTime;
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String endTime;
+
+ //鎼滅储鏉′欢
+ //鐢ㄦ埛鍚嶆煡鎵�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String userName;
+ //瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channelsTypeId;
+ //瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channelId;
+ //瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channel2Id;
+ //鍜ㄨ甯�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String hisCorpUserId;
+ //鐢ㄦ埛椤鹃棶鍚嶇О
+ private String hisCorpUserName;
+ //鎵嬫満鍙�
+ private String tel;
+ //鐢电綉鍜ㄨ甯�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String internetCorpUserId;
+ //瀹㈡湇
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String chatCorpUserId;
+ //鍒涘缓浜�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String createEmployeeId;
+ //鍒涘缓浜洪儴闂�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String createEmployeePartId;
+ //鍏虫敞娲诲姩
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String focusActivityId;
+ //鍒拌绫诲瀷
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String recentVisitType;
+ //鍒拌鐘舵��
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Integer recentVisitStatus;
+ //鏄惁鎴愪氦
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Integer isMakeADeal;
+
+ //鍒楄〃鎺ュ彛 灏忕▼搴忎篃浣跨敤 鍖哄垎鏄惁鏄粠鐢ㄦ埛璇︽儏杩涘幓鐨�
+ private Integer isDetail;
+
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum = 1;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize = 20;
+ /**鍏抽敭瀛�*/
+ private String keyWord;
+ /**鏌ヨ鏂瑰紡*/
+ private String useType;
+ public ConsultRecordDto() {
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(String shopId) {
+ this.shopId = shopId;
+ }
+
+ public Integer getConsultType() {
+ return consultType;
+ }
+
+ public void setConsultType(Integer consultType) {
+ this.consultType = consultType;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getFaceDoctorId() {
+ return faceDoctorId;
+ }
+
+ public void setFaceDoctorId(String faceDoctorId) {
+ this.faceDoctorId = faceDoctorId;
+ }
+
+ public String getTreatDoctorId() {
+ return treatDoctorId;
+ }
+
+ public void setTreatDoctorId(String treatDoctorId) {
+ this.treatDoctorId = treatDoctorId;
+ }
+
+ public String getAppealDetail() {
+ return appealDetail;
+ }
+
+ public void setAppealDetail(String appealDetail) {
+ this.appealDetail = appealDetail;
+ }
+
+ public String getTreatPlanQuote() {
+ return treatPlanQuote;
+ }
+
+ public void setTreatPlanQuote(String treatPlanQuote) {
+ this.treatPlanQuote = treatPlanQuote;
+ }
+
+ public String getDosageParams() {
+ return dosageParams;
+ }
+
+ public void setDosageParams(String dosageParams) {
+ this.dosageParams = dosageParams;
+ }
+
+ public String getAnamnesis() {
+ return anamnesis;
+ }
+
+ public void setAnamnesis(String anamnesis) {
+ this.anamnesis = anamnesis;
+ }
+
+ public String getHasTreatProjects() {
+ return hasTreatProjects;
+ }
+
+ public void setHasTreatProjects(String hasTreatProjects) {
+ this.hasTreatProjects = hasTreatProjects;
+ }
+
+ public Integer getIsDraft() {
+ return isDraft;
+ }
+
+ public void setIsDraft(Integer isDraft) {
+ this.isDraft = isDraft;
+ }
+
+ public Integer getAdminType() {
+ return adminType;
+ }
+
+ public void setAdminType(Integer adminType) {
+ this.adminType = adminType;
+ }
+
+ public String getAdminId() {
+ return adminId;
+ }
+
+ public void setAdminId(String adminId) {
+ this.adminId = adminId;
+ }
+
+ public String getAdminName() {
+ return adminName;
+ }
+
+ public void setAdminName(String adminName) {
+ this.adminName = adminName;
+ }
+
+ public String getTreatProjectIds() {
+ return treatProjectIds;
+ }
+
+ public void setTreatProjectIds(String treatProjectIds) {
+ this.treatProjectIds = treatProjectIds;
+ }
+
+ public String getRecommendProjectIds() {
+ return recommendProjectIds;
+ }
+
+ public void setRecommendProjectIds(String recommendProjectIds) {
+ this.recommendProjectIds = recommendProjectIds;
+ }
+
+ public List<Map<String, Object>> getTreatProjectList() {
+ return treatProjectList;
+ }
+
+ public void setTreatProjectList(List<Map<String, Object>> treatProjectList) {
+ this.treatProjectList = treatProjectList;
+ }
+
+ public List<Map<String, Object>> getRecommendProjectList() {
+ return recommendProjectList;
+ }
+
+ public void setRecommendProjectList(List<Map<String, Object>> recommendProjectList) {
+ this.recommendProjectList = recommendProjectList;
+ }
+
+ public String getFacePlan() {
+ return facePlan;
+ }
+
+ public void setFacePlan(String facePlan) {
+ this.facePlan = facePlan;
+ }
+
+ public Integer getSatisfie() {
+ return satisfie;
+ }
+
+ public void setSatisfie(Integer satisfie) {
+ this.satisfie = satisfie;
+ }
+
+ public String getFaceDoctorName() {
+ return faceDoctorName;
+ }
+
+ public void setFaceDoctorName(String faceDoctorName) {
+ this.faceDoctorName = faceDoctorName;
+ }
+
+ public String getTreatDoctorName() {
+ return treatDoctorName;
+ }
+
+ public void setTreatDoctorName(String treatDoctorName) {
+ this.treatDoctorName = treatDoctorName;
+ }
+
+ 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 Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getChannelsTypeId() {
+ return channelsTypeId;
+ }
+
+ public void setChannelsTypeId(String channelsTypeId) {
+ this.channelsTypeId = channelsTypeId;
+ }
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getChannel2Id() {
+ return channel2Id;
+ }
+
+ public void setChannel2Id(String channel2Id) {
+ this.channel2Id = channel2Id;
+ }
+
+ public String getHisCorpUserId() {
+ return hisCorpUserId;
+ }
+
+ public void setHisCorpUserId(String hisCorpUserId) {
+ this.hisCorpUserId = hisCorpUserId;
+ }
+
+ public String getHisCorpUserName() {
+ return hisCorpUserName;
+ }
+
+ public void setHisCorpUserName(String hisCorpUserName) {
+ this.hisCorpUserName = hisCorpUserName;
+ }
+
+ public String getTel() {
+ return tel;
+ }
+
+ public void setTel(String tel) {
+ this.tel = tel;
+ }
+
+ public String getInternetCorpUserId() {
+ return internetCorpUserId;
+ }
+
+ public void setInternetCorpUserId(String internetCorpUserId) {
+ this.internetCorpUserId = internetCorpUserId;
+ }
+
+ public String getChatCorpUserId() {
+ return chatCorpUserId;
+ }
+
+ public void setChatCorpUserId(String chatCorpUserId) {
+ this.chatCorpUserId = chatCorpUserId;
+ }
+
+ public String getCreateEmployeeId() {
+ return createEmployeeId;
+ }
+
+ public void setCreateEmployeeId(String createEmployeeId) {
+ this.createEmployeeId = createEmployeeId;
+ }
+
+ public String getCreateEmployeePartId() {
+ return createEmployeePartId;
+ }
+
+ public void setCreateEmployeePartId(String createEmployeePartId) {
+ this.createEmployeePartId = createEmployeePartId;
+ }
+
+ public String getFocusActivityId() {
+ return focusActivityId;
+ }
+
+ public void setFocusActivityId(String focusActivityId) {
+ this.focusActivityId = focusActivityId;
+ }
+
+ public String getRecentVisitType() {
+ return recentVisitType;
+ }
+
+ public void setRecentVisitType(String recentVisitType) {
+ this.recentVisitType = recentVisitType;
+ }
+
+ public Integer getRecentVisitStatus() {
+ return recentVisitStatus;
+ }
+
+ public void setRecentVisitStatus(Integer recentVisitStatus) {
+ this.recentVisitStatus = recentVisitStatus;
+ }
+
+ public Integer getIsMakeADeal() {
+ return isMakeADeal;
+ }
+
+ public void setIsMakeADeal(Integer isMakeADeal) {
+ this.isMakeADeal = isMakeADeal;
+ }
+
+ public String getLastTreatDoctorId() {
+ return lastTreatDoctorId;
+ }
+
+ public void setLastTreatDoctorId(String lastTreatDoctorId) {
+ this.lastTreatDoctorId = lastTreatDoctorId;
+ }
+
+ public String getLastTreatProjects() {
+ return lastTreatProjects;
+ }
+
+ public void setLastTreatProjects(String lastTreatProjects) {
+ this.lastTreatProjects = lastTreatProjects;
+ }
+
+ public String getLastTreatDoctorName() {
+ return lastTreatDoctorName;
+ }
+
+ public void setLastTreatDoctorName(String lastTreatDoctorName) {
+ this.lastTreatDoctorName = lastTreatDoctorName;
+ }
+
+ public List<Map<String, Object>> getLastTreatProjectList() {
+ return lastTreatProjectList;
+ }
+
+ public void setLastTreatProjectList(List<Map<String, Object>> lastTreatProjectList) {
+ this.lastTreatProjectList = lastTreatProjectList;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ 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 String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getMethodCode() {
+ return methodCode;
+ }
+
+ public void setMethodCode(String methodCode) {
+ this.methodCode = methodCode;
+ }
+
+ public String getMethodCodeName() {
+ return methodCodeName;
+ }
+
+ public void setMethodCodeName(String methodCodeName) {
+ this.methodCodeName = methodCodeName;
+ }
+
+ public String getUseType() {
+ return useType;
+ }
+
+ public void setUseType(String useType) {
+ this.useType = useType;
+ }
+
+ public Integer getIsDetail() {
+ return isDetail;
+ }
+
+ public void setIsDetail(Integer isDetail) {
+ this.isDetail = isDetail;
+ }
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
index 64111b7..f4336cb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
@@ -20,6 +20,8 @@
/**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
private List<String> payMethodList;
+ /** 妫�鏌ヤ紭鎯犲埜鐮佹槸鍚﹀凡琚娇鐢紝榛樿ture妫�鏌ワ紝鍗囧崟鏄痜alse涓嶆鏌� */
+ private boolean checkCouponNumberIsUse = true;
/**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/
private BigDecimal total;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index fdb98a9..6ff579f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -25,7 +25,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
- private String id;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
@@ -51,4 +51,9 @@
/** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
private Integer isMarketApply = 0;
+
+ /** 浼樻儬鍒稿垎绫籌D*/
+ private String couponTypeId;
+ /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+ private String type;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index 8390d10..2f5a118 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -28,4 +28,10 @@
private List<String> payMethodList;
/**浼樻儬鍒稿钩鍙�*/
private String platform;
+
+ /** 璁㈠崟鏍囪瘑List */
+ private List<String> orderIdList;
+ /** 璁㈠崟鏍囪瘑 */
+ private String orderId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
new file mode 100644
index 0000000..6a6b5c5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -0,0 +1,38 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendDto{
+
+ /**鎿嶄綔浜虹被鍨�*/
+ private String operatorType;
+ /**鎿嶄綔浜烘爣璇�-蹇呭～*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�-蹇呭～*/
+ private String operatorName;
+
+ /**鎿嶄綔浜鸿鑹叉爣璇�-闈炲繀濉�*/
+ private String roleId;
+ /**鎿嶄綔浜哄钩鍙�-闈炲繀濉�*/
+ private String appIdCode;
+ /**鎿嶄綔澶囨敞-闈炲繀濉�*/
+ private String operatorRemark;
+
+ /**鏉ユ簮鏍囪瘑*/
+ private String commonId;
+ /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
+ private String commonType;
+ /**鏉ユ簮瀛愭爣璇�*/
+ private String commonItemId;
+
+ /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+ private List<CouponSendUserDto> sendUserList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
new file mode 100644
index 0000000..34912e0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendItemDto {
+ /**鍙戞斁鎵规-蹇呭～*/
+ private String recordName;
+ /**浼樻儬鍒告爣璇�-蹇呭～*/
+ private String couponId;
+ /**鍙戞斁鏁伴噺-蹇呭～*/
+ private Integer num;
+
+ /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
+ private String startTime;
+ /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅～榛樿涓�涓湀*/
+ private String endTime;
+ /**鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉�*/
+ private String costDeptName;
+ /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */
+ private String ascrCostDeptName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
new file mode 100644
index 0000000..8486810
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendUserDto {
+ /**phis鐢ㄦ埛鏍囪瘑-蹇呭～*/
+ private String userId;
+ /**鏄惁鍙戦�佺煭淇�0鍚�1鏄�-榛樿鍚�*/
+ private Integer isSendMsg = 0;
+
+ /**娑堣�楁�诲偍鍊奸噾*/
+ private BigDecimal storedValueFund;
+ /**娑堣�楁�诲鍊奸噾*/
+ private BigDecimal valueAddedFund;
+ /**娑堣�楁�荤Н鍒�*/
+ private BigDecimal integral;
+
+ /**鍙戦�佺殑鍒�*/
+ private List<CouponSendItemDto> couponList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
new file mode 100644
index 0000000..f40547c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.coupon;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponTypeDto extends PageDto {
+ /**鏄惁钀ラ攢鍔╂墜鍙敵璇�*/
+ private Integer isMarketAssistantApply;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index a5e55e7..393375f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -96,6 +96,9 @@
// 瀵规瘮鐓х墖璁板綍
private String comparePhotoRecordJson;
+ // 鍒掓墸鐓х墖json
+ private String deductionPictureJson;
+
// 鎵归噺娣诲姞椤圭洰id鍒楄〃
private String userProjectIds;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
new file mode 100644
index 0000000..d6c6ca6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmpAuthDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.employee;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * */
+@Data
+public class EmpAuthDto{
+ /**鏉冮檺*/
+ private String tagName;
+ /**鐧诲綍鍛樺伐*/
+ private String empRoleId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
new file mode 100644
index 0000000..c3cba43
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -0,0 +1,70 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 钀ラ攢娲诲姩
+ * @USER: fhx
+ * @DATE: 2023/7/3
+ **/
+@Data
+public class MarketActivityDto extends PageDto {
+
+ /** 鍒嗙被id */
+ private String classifyId;
+ /** 鐘舵��:0鏈紑濮�1杩涜涓�2宸茬粨鏉� */
+ private Integer status;
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+ /** 鏄惁鍏宠仈浼樻儬鍒� */
+ private Integer isCoupon;
+ /** 鏄惁鍏宠仈椤圭洰 */
+ private Integer isProject;
+ /** 鏄惁鍚屾鑹捐姱浼� */
+ private Integer isSyncCrm;
+ /** 鏄惁涓婁笅鏋� */
+ private Integer isUp;
+
+ /** 浼氬憳绛夌骇 */
+ private String userLevel;
+ /** 闂ㄥ簵id/鎵�灞為棬搴梚d */
+ private String shopId;
+ /** 鏄惁鏄鍙栦紭鎯犲埜 */
+ private Integer isReceiveCoupon;
+ /** 鏄惁鏄娇鐢ㄤ紭鎯犲埜 */
+ private Integer isUseCoupon;
+ /** 鏄惁娑堣垂 */
+ private Integer isConsume;
+
+ /** 鍏宠仈椤圭洰绫诲瀷 */
+ private String commonType;
+
+
+ //-------------------
+ /** 澶氶棬搴梚d锛堥�楀彿鍒嗗壊锛� */
+ private String shopIds;
+ /** 鐢ㄦ埛id */
+ private String userId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+ /** 钀ラ攢娲诲姩id */
+ private String marketActivityId;
+ /** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
+ private String activityCouponId;
+
+ /** 骞冲彴绫诲瀷(PlatformConstants) */
+ private String platformType;
+ /** 鎿嶄綔浜烘爣璇� */
+ private String opId;
+ /** 鎿嶄綔浜哄悕绉� */
+ private String opName;
+ /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+ private Integer opType;
+ /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+ private String opRoleId;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java
new file mode 100644
index 0000000..7d43638
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/meiji/MjSkinReportItemDto.java
@@ -0,0 +1,42 @@
+package com.hz.his.dto.meiji;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName MjSkinReportDto
+ * @Description 缇庨檯妗ｆ瀛愮被鏁版嵁Dto
+ * @Author wrh
+ * @Date 2023/8/25 15:43
+ * @Version 1.0
+ */
+@Data
+public class MjSkinReportItemDto {
+
+ /**缁撴灉鍊�*/
+ private BigDecimal result;
+ /**缂洪櫡绛夌骇鍊�*/
+ private Integer level;
+ /**鍚嶇О*/
+ private String name;
+ /**绋嬪害*/
+ private String degree;
+
+ //鐨偆鍒嗘瀽绫诲瀷
+ public static final String TYPE_PORE = "姣涘瓟";
+ //榛戝ご
+ public static final String TYPE_BLACKHEAD = "榛戝ご";
+ //T鍖哄嚭娌�
+ public static final String TYPE_T = "T鍖哄嚭娌�";
+ //T鍖哄嚭娌�
+ public static final String TYPE_U = "U鍖哄嚭娌�";
+ //鑹叉枒 stain
+ public static final String TYPE_STAIN = "鑹叉枒";
+ //娉涚孩 reddening
+ public static final String TYPE_REDDENING = "娉涚孩";
+ //绾㈣涓� Redness
+ public static final String TYPE_REDNESS = "绾㈣涓�";
+ //鐥ょ柈 acne
+ public static final String TYPE_ACNE = "鐥ょ柈";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
index ea7148e..ca3f5b5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
@@ -12,7 +12,7 @@
@Data
public class CardItemInfoDto {
/**
- * 浣跨敤娆℃暟
+ * 璐拱鍟嗗搧鏁伴噺锛屾敞鎰忥細涓嶆槸鎶垫墸娆℃暟
*/
private Integer userNum;
/**
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
new file mode 100644
index 0000000..31b48a3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
@@ -0,0 +1,44 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟鏀粯鏂瑰紡dto
+ * @USER: fhx
+ * @DATE: 2023/8/24
+ **/
+@Data
+public class OrderConsumePayDto {
+
+ /** 瀹為檯鏀粯閲戦 */
+ private BigDecimal amount;
+ /** 鏀粯缂栫爜 */
+ private String method;
+ /** 鏀粯鏂瑰紡鍚嶇О */
+ private String methodName;
+ /** 鏀粯鐨勫晢鍝�/椤圭洰/缁勫悎濂楅/缁勫悎鍗￠」鐨勬爣璇� */
+ private String commonId;
+ /** 鍗￠」鐨勬潈鐩婄被鍨嬫爣璇� */
+ private String cardEquityId;
+ /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+ private String userCardId;
+ /** 瀵瑰簲鍒ゆ柇鏍囪瘑锛屽鏋滄椂绉垎鏀粯鏃跺搴旓細101=涓嶉渶鎵ｅ噺绉垎锛�100=闇�瑕佹墸鍑忕Н鍒� */
+ private Integer isDel = 0;
+
+ /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**闈炲繀濉� 娆＄骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+ private String assistOrderNo;
+ /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+ private String ocrImageUrl;
+
+ public OrderConsumePayDto() {
+ }
+
+ public OrderConsumePayDto(BigDecimal amount, String method) {
+ this.amount = amount;
+ this.method = method;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 2992a9f..ae6779a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -47,4 +47,7 @@
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
+ /** 璇夋眰鍒嗙被idList */
+ private List<String> appealTypeIdList;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index d1ffe6b..8c63637 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.order;
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;
import java.math.BigDecimal;
@@ -27,11 +28,13 @@
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
- /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
- /** 鍙��鎬婚噾棰�*/
- private BigDecimal approveRefundTotal = BigDecimal.ZERO;
-
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index bb27487..db2ccce 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -1,8 +1,10 @@
package com.hz.his.dto.order;
+import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @Author
@@ -26,8 +28,10 @@
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
- /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
- /** 鍙��鎬婚噾棰�*/
+ /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+ private List<RefundDeductionCancelVo> refundDeductionCancelList;
+
+ /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index a0a1f97..d6eed8b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -30,4 +30,7 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
+ /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */
+ private List<OrderRiseDto> orderRiseList;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index e05dee0..d956e15 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -26,6 +26,8 @@
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+ /** Y-鑷姩浣滃簾鍒掓墸 0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/
+ private Integer deductionCancel = 0;
/** 鎿嶄綔浜哄憳宸ユ爣璇�*/
private String operatorId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
index dc7d8e4..d34e59f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
@@ -7,31 +7,23 @@
/**
* @Author
*/
-
@Data
public class OrderRefundNoteDto {
- //蹇呭～
- private String id;
+ //閫�娆炬柟寮忔�昏〃鏍囪瘑锛屽繀瑕�
+ private String refundRecordMethodId;
+
//鏀粯鎬婚噾棰� 蹇呭～
private BigDecimal paymentTotal;
// 鏀粯鏂瑰紡缂栧彿 蹇呭～
private String paymentNumberNo;
//鏀粯鏂瑰紡鍚嶇О 蹇呭～
private String paymentName;
+
//閫�娆捐矾寰�" 蹇呭～
private Integer refundroute;
//閫�娆炬柟寮忕紪鍙� 蹇呭～
private String refundNumberNo;
//閫�娆炬柟寮忓悕绉� 蹇呭～
private String refundName;
- //鍙湁鍦ㄨ浆鍌ㄥ�奸噾鐨勬椂鍊欐墠鏈夎繖鐜╂剰
- //閫�娆惧偍鍊奸噾閲戦
- private BigDecimal refundStoredTotal;
- //閫�娆剧姸鎬�
- private Integer refundStatus;
- //澶囨敞
- private String remarks;
- //绾夸笅閫�娆惧嚟璇佸浘鐗囧湴鍧� 鏍煎紡鈥滃浘鐗囦竴锛屽浘鐗囦簩鈥�
- private String imageList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java
new file mode 100644
index 0000000..2bbd2da
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * 璁㈠崟鍗囧崟鍏宠仈dto
+ * @USER: fhx
+ * @DATE: 2023/8/23
+ **/
+@Data
+public class OrderRiseDto {
+
+ /** 鍏宠仈璁㈠崟鏍囪瘑(OrdersTotal) */
+ private String assocOrderId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 60a9bc3..bee390c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -97,6 +97,8 @@
/**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
private List<String> activityIds;
- /** 娌荤枟鍗昳d */
+ /** 娌荤枟鍗昳d(鐩墠娌＄敤) */
private String treatSingleId;
+ /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+ private String addWay;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index a92147a..7b0dc41 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -30,4 +30,11 @@
* isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
*/
private Integer isDel = 0;
+
+ /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**闈炲繀濉� 娆＄骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+ private String assistOrderNo;
+ /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+ private String ocrImageUrl;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index a8b6967..210a568 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -24,6 +24,8 @@
private List<PayAmountDto> amount;
/**蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
private String operatorId;
+ /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭～锛岄��娆句娇鐢�) */
+ private String opRoleId;
/**鏀粯鐢ㄦ埛*/
private String payUserId;
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
index 3d35463..12dc6c9 100644
--- 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
@@ -11,4 +11,9 @@
public class ProjectDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
+
+ /**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
+ private String minPrice;
+ private String maxPrice;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java
new file mode 100644
index 0000000..2107ece
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java
@@ -0,0 +1,61 @@
+package com.hz.his.dto.quotation;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 鎶ヤ环鍗曚紶鍊糳to
+ * @USER: fhx
+ * @DATE: 2023/8/8
+ **/
+@Data
+public class QuotationDto extends PageDto {
+
+ //鎼滅储鍙傛暟
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+ /** 缂栧彿 */
+ private String codeNo;
+
+ //浼犲�煎弬鏁�
+ /** 鍒拌璁㈠崟鏍囪瘑 */
+ private String visitOrderId;
+ /** 鐢ㄦ埛鏍囪瘑 */
+ private String userId;
+ /** 骞冲彴绫诲瀷 */
+ private String platformType;
+ /** 鎬讳环(閫昏緫绱鍚庡～鍏咃紝闈炰紶鍙備娇鐢�) */
+ private BigDecimal totalPrice;
+
+ /** 鐨偆妗ｆ鏍囪瘑(MjSkinReport) */
+ private String pfDaId;
+ /** 寰暣娉ㄥ皠鏍囪瘑(AppearanceTotal) */
+ private String wzZsId;
+ /** 寰暣娉ㄥ皠-鍥剧墖璺緞 */
+ private String wzZsImgUrl;
+ /** 浣撴�佸褰㈡爣璇�(AppearanceTotal) */
+ private String ttSxId;
+ /** 浣撴�佸褰�-鍥剧墖璺緞 */
+ private String ttSxImgUrl;
+
+ /** 鎿嶄綔浜烘爣璇� */
+ private String opId;
+ /** 鎿嶄綔浜哄悕绉� */
+ private String opName;
+ /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+ private Integer opType;
+ /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+ private String opRoleId;
+
+ /** 瀛愰」鍒楄〃淇℃伅 */
+ private List<QuotationItemDto> itemList;
+
+ public QuotationDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemAssocDto.java b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemAssocDto.java
new file mode 100644
index 0000000..36541eb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemAssocDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.quotation;
+
+import lombok.Data;
+
+/**
+ * 鎶ヤ环鍗曞瓙椤瑰叧鑱斾俊鎭痙to
+ * @USER: fhx
+ * @DATE: 2023/8/8
+ **/
+@Data
+public class QuotationItemAssocDto {
+
+ /** 鍏宠仈鏍囪瘑(閫傚簲鐥�/鏍囩) */
+ private String assocId;
+ /** 鍏宠仈鍚嶇О(鍐椾綑) */
+ private String assocName;
+
+ public QuotationItemAssocDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java
new file mode 100644
index 0000000..77ad379
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationItemDto.java
@@ -0,0 +1,55 @@
+package com.hz.his.dto.quotation;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鎶ヤ环鍗曞瓙椤筪to
+ * @USER: fhx
+ * @DATE: 2023/8/8
+ **/
+@Data
+public class QuotationItemDto {
+
+ /** QuotationItem琛╥d */
+ private String id;
+
+ /** 鍏宠仈绫诲瀷 */
+ private String assocType;
+
+ /** 鍟嗗搧绫诲瀷(OrderItemConstants) */
+ @Column(comment = "", length = 20, type = MySqlTypeConstant.VARCHAR,isNull = false)
+ private String type;
+ /** 椤圭洰id/鍟嗗搧id/濂楅id/鍏朵粬id */
+ private String goodsId;
+ /** 椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜 */
+ private String goodsNo;
+ /** 椤圭洰鍚嶇О/鍟嗗搧鍚嶇О */
+ private String goodsName;
+
+ /** 韬綋閮ㄤ綅鍚嶇О */
+ private String bodyPartsName;
+ /** 瑙勬牸 */
+ private String specs;
+ /** 鍗曚綅 */
+ private String unit;
+ /** 鍖荤敓璧勮川 */
+ private String doctorQualification;
+
+ /** 椤圭洰鍘熶环 */
+ private BigDecimal oriPrice;
+ /** 鍞环 */
+ private BigDecimal price;
+ /** 璐拱鏁伴噺 */
+ private Integer buyNum;
+
+ /** 澶氬叧鑱斾俊鎭� */
+ private List<QuotationItemAssocDto> itemAssocList;
+
+ public QuotationItemDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index e324612..cee6e84 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 鍒掓墸
@@ -34,7 +35,12 @@
private String userShopId;
/**閿�鍞钩鍙�*/
private String sourceName;
-
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
private String operatorId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
index bb999f1..f223034 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ClinicPerfReqDto.java
@@ -3,6 +3,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* 璇婃墍鐜伴噾涓氱哗VO
* @USER: fhx
@@ -29,4 +31,8 @@
private String operatorId;
/** 鎿嶄綔浜� */
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
index d8ab8f4..bb6528e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
@@ -32,4 +32,6 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index afef51e..a7127cf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
@@ -33,4 +34,11 @@
private Integer isNewUser;
/**鏄惁棣栧ぉ*/
private Integer isBothOne;
+ /**宸ヤ綔鏃�*/
+ private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
index 3ad3d52..bf56620 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
@@ -16,10 +16,14 @@
private String month;
/**鏈堜唤:yyyy-MM-dd*/
private String day;
-
+ /**鐢ㄦ埛澧為暱娓犻亾:1鏄�,0鍚�*/
+ private Integer selectUser;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**娓犻亾澶х被娓犻亾鏍囪瘑闆嗗悎*/
+ private List<String> channelList;
/**寮�濮嬫椂闂�*/
private Date startTime;
/**缁撴潫鏃堕棿*/
@@ -30,6 +34,8 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
public List<String> getShopIdList() {
if(shopIdList == null){
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
index 9bf67f6..8560f79 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
@@ -19,6 +19,8 @@
private String endTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
/**涓氱哗绫诲瀷-闂ㄥ簵鏃ョ幇閲戜笟缁�*/
public static final String TYPE_DAY_CASH= "day_cash";
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index ab01413..c05f351 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -24,4 +24,7 @@
private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
index 8090bbb..b9e5a65 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReleaseDto.java
@@ -22,4 +22,7 @@
private List<String> employeeIdList;
/**绛夌骇鍒楄〃*/
private List<String> memberLevelList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
index 2d64d2d..b98373f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
@@ -27,7 +27,7 @@
/** 璇佷欢缂栧彿 */
private String certificateNo;
/** 鎬у埆 */
- private Integer gender = SEX_WUMAN;
+ private Integer gender;
/** 涓荤數璇濆彿鐮� */
private String tel;
/** 鐢佃瘽鍖虹爜 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 00da1d8..6d7ad5e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -33,6 +33,8 @@
private Integer isSelectShop = 0;
/**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
private Integer isSelectInvitee = 0;
+ /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+ private Integer isSelectMoney = 0;
/**鏄惁鏈夐棬搴�*/
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java
index dfaed1a..b21bc83 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserPackListDto.java
@@ -8,5 +8,6 @@
/**浜虹兢鍖呯敤鎴锋煡璇㈠弬鏁�*/
@Data
public class UserPackListDto {
+ private String fromCode;
private List<UserPackDto> list;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 4bca9ee..eae2439 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -74,7 +74,7 @@
/** 璇█绫诲瀷鍚嶇О */
private String languageTypeName;
/** 鐢ㄦ埛骞撮緞 */
- private Integer year = 0;
+ private Integer year;
/** 鏄熷骇绫诲瀷鍚嶇О */
private String constellationTypeName;
@@ -154,6 +154,17 @@
private String opId;
//淇敼鎿嶄綔鐨勫娉�
private String note;
+ /** 鎬у埆0鏈煡1鐢�2濂� */
+ private Integer gender;
+
+ /**鏄惁杞瘖*/
+ private Integer isTransfer;
+ /**杞瘖淇℃伅*/
+ private UserTransferDto transferRecord;
+
+ /**涓昏璇夋眰**/
+ private String mainAppeal;
+ private String minorAppeal;
public UserParamDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java
new file mode 100644
index 0000000..a23627b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserTransferDto.java
@@ -0,0 +1,58 @@
+package com.hz.his.dto.user;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 杞瘖鍙傛暟
+ */
+@Data
+public class UserTransferDto{
+ /**鐢ㄦ埛id*/
+ private String userId;
+ /**鐘舵��*/
+ private Integer status;
+ /**绫诲瀷 0 杞瘖 1 杞枟*/
+ private Integer type;
+ /**杞嚭闂ㄥ簵id*/
+ private String transferOutShopId;
+ /**杞嚭闂ㄥ簵鍚嶇О*/
+ private String transferOutShopName;
+ /**杞叆闂ㄥ簵id*/
+ private String transferIntoShopId;
+ /**杞叆闂ㄥ簵鍚嶇О*/
+ private String transferIntoShopName;
+ /**杞叆鏃堕棿*/
+ private Date transferTime;
+ /**鐢宠浜虹被鍨�*/
+ private Integer applyAdminType;
+ /**鐢宠浜篿d*/
+ private String applyAdminId;
+ /**鐢宠浜哄悕绉�*/
+ private String applyAdminName;
+ /**瀹℃牳浜虹被鍨�*/
+ private Integer approvedAdminType;
+ /**瀹℃牳浜篿d*/
+ private String approvedAdminId;
+ /**瀹℃牳浜哄悕绉�*/
+ private String approvedAdminName;
+ /**瀹℃牳鏃堕棿*/
+ private Date approvedTime;
+ /**澶囨敞*/
+ private String remark;
+ /**鏄惁鐭俊鎻愰啋*/
+ private Integer isNotice;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**鎿嶄綔浜篒d*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉癗ame*/
+ private String operatorName;
+
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 5ec403f..a1a41fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -99,4 +99,6 @@
public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
/**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
+ /**鎿嶄綔鏂瑰紡-钀ラ攢鍔╂墜绉垎鍏戞崲浼樻儬鍒�*/
+ public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java
new file mode 100644
index 0000000..930862d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserTurnDto.java
@@ -0,0 +1,50 @@
+package com.hz.his.dto.user.money;
+
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ *
+ * 鐢ㄦ埛杞禒
+ * @author fwq
+ * @date 2022-3-3
+ */
+@Data
+public class UserTurnDto {
+
+ /**杞禒浜烘爣璇�*/
+ private String turnPeopleId;
+ /**杞禒浜哄悕绉�*/
+ private String turnPeopleName;
+ /**杞禒闂ㄥ簵鏍囪瘑(璁㈠崟鎿嶄綔浜虹殑闂ㄥ簵)*/
+ private String turnShopId;
+ /**杞禒闂ㄥ簵鍚嶇О(璁㈠崟鎿嶄綔浜虹殑闂ㄥ簵)*/
+ private String turnShopName;
+ /**鍙楄禒浜烘爣璇�*/
+ private String doneeId;
+ /**鍙楄禒浜哄悕绉�*/
+ private String doneeName;
+ /**杞禒闂ㄥ簵鏍囪瘑(璁㈠崟鎿嶄綔浜虹殑闂ㄥ簵)*/
+ private String doneeShopId;
+ /**杞禒闂ㄥ簵鏍囪瘑(璁㈠崟鎿嶄綔浜虹殑闂ㄥ簵)*/
+ private String doneeShopName;
+ /**杞禒澧炲�奸噾*/
+ private String incrementMoney;
+ /**杞禒鍌ㄥ�奸噾*/
+ private String storedMoney;
+ /**杞禒绉垎*/
+ private String integral;
+ /**鍒涘缓浜烘爣璇�*/
+ private String createId;
+ /**鍒涘缓浜哄悕绉�*/
+ private String createName;
+ /**澶囨敞*/
+ private String remarks;
+ /**涓婚*/
+ private String originSubject;
+ /**骞冲彴code*/
+ private String appIdCode;
+ /**鍏宠仈鏍囪瘑*/
+ private String commonId;
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
new file mode 100644
index 0000000..dd2365a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
@@ -0,0 +1,219 @@
+package com.hz.his.dto.user.usercompleteInfo;
+
+
+/***
+ * 鐢ㄦ埛鎵爜瀹屽杽璧勬枡 dto
+ */
+public class UserInfoCompleteDto {
+
+ //鐢ㄦ埛ID
+ private String userId;
+ //鐢ㄦ埛鍚嶇О
+ private String name;
+ //鎬у埆 0=鏈煡 1=鐢� 2=濂�
+ private Integer gender;
+ //鎵嬫満鍙�
+ private String tel;
+ //閭
+ private String email;
+ //璇佷欢绫诲瀷
+ private Integer certificateType;
+ //璇佷欢鍙风爜
+ private String certificateNo;
+ //鍑虹敓鏃ユ湡
+ private String birthDay;
+ //宸ヤ綔
+ private String professionTypeName;
+ //濠氬惁
+ private String marriageTypeName;
+ //鐢熻偛
+ private String growthTypeName;
+
+ //鍦板潃淇℃伅
+ private String country;
+ private String province;
+ private String city;
+ private String area;
+ private String detail;
+
+ //鏉ユ簮-娓犻亾鍚嶇О
+ private String sourceName;
+
+ //鏄惁濂藉弸鎺ㄨ崘 0=鍚� 1=鏄�
+ private Integer isFriendReferrer;
+ //濂藉弸鍚嶇О
+ private String friendName;
+ //涓昏璇夋眰
+ private String mainAppeal;
+ //娆¤璇夋眰
+ private String minorAppeal;
+
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getGender() {
+ return gender;
+ }
+
+ public void setGender(Integer gender) {
+ this.gender = gender;
+ }
+
+ 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 Integer getCertificateType() {
+ return certificateType;
+ }
+
+ public void setCertificateType(Integer certificateType) {
+ this.certificateType = certificateType;
+ }
+
+ public String getCertificateNo() {
+ return certificateNo;
+ }
+
+ public void setCertificateNo(String certificateNo) {
+ this.certificateNo = certificateNo;
+ }
+
+ public String getBirthDay() {
+ return birthDay;
+ }
+
+ public void setBirthDay(String birthDay) {
+ this.birthDay = birthDay;
+ }
+
+ public String getProfessionTypeName() {
+ return professionTypeName;
+ }
+
+ public void setProfessionTypeName(String professionTypeName) {
+ this.professionTypeName = professionTypeName;
+ }
+
+ public String getMarriageTypeName() {
+ return marriageTypeName;
+ }
+
+ public void setMarriageTypeName(String marriageTypeName) {
+ this.marriageTypeName = marriageTypeName;
+ }
+
+ public String getGrowthTypeName() {
+ return growthTypeName;
+ }
+
+ public void setGrowthTypeName(String growthTypeName) {
+ this.growthTypeName = growthTypeName;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ 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 getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+ public Integer getIsFriendReferrer() {
+ return isFriendReferrer;
+ }
+
+ public void setIsFriendReferrer(Integer isFriendReferrer) {
+ this.isFriendReferrer = isFriendReferrer;
+ }
+
+ public String getFriendName() {
+ return friendName;
+ }
+
+ public void setFriendName(String friendName) {
+ this.friendName = friendName;
+ }
+
+ public String getMainAppeal() {
+ return mainAppeal;
+ }
+
+ public void setMainAppeal(String mainAppeal) {
+ this.mainAppeal = mainAppeal;
+ }
+
+ public String getMinorAppeal() {
+ return minorAppeal;
+ }
+
+ public void setMinorAppeal(String minorAppeal) {
+ this.minorAppeal = minorAppeal;
+ }
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index ee1befb..dc62742 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -116,6 +116,13 @@
Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);
/**
+ * 鐢ㄦ埛-鍗囧崟璁㈠崟鐨勫師浣跨敤浼樻儬鍒稿垪琛�
+ * @return canUseCouponList鍙敤鍒稿垪琛� canUseCount鍙敤鍒告暟閲�
+ * */
+ @PostMapping(value = "/coupon/user/riseOrderOriCouponList")
+ Result riseOrderOriCouponList(@RequestBody(required = false) CouponListDto couponListDto);
+
+ /**
* 鏍规嵁skuid鏌ヨ鍏宠仈浼樻儬鍒�
*/
@PostMapping(value = "/coupon/find/skuId")
@@ -130,4 +137,16 @@
*/
@PostMapping(value = "/coupon/user/goods")
Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
+
+ /**
+ * 鏌ヨ鍩虹鍒嗙被
+ */
+ @PostMapping(value = "/coupon/type/list")
+ Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+
+ /**
+ * 鏌ヨ浼樻儬鍒稿垎绫�
+ */
+ @PostMapping(value = "/couponType/list")
+ Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 4e4d24a..5393a67 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
@@ -74,4 +75,10 @@
@PostMapping(value = "/emp/detail/name")
Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+ @PostMapping(value = "/emp/role/get/one")
+ Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
+ @PostMapping(value = "/emp/auth/check")
+ Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
index 05fa958..d04f3a2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SMeiJiService.java
@@ -15,8 +15,14 @@
public interface SMeiJiService {
/**
- * 璁㈠崟鍒楄〃
+ * 缇庨檯妗ｆ鍒楄〃
*/
@PostMapping(value = "/meiji/userSkinReportList")
Result userSkinReportList(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑缇庨檯妗ｆ
+ */
+ @PostMapping(value = "/meiji/one")
+ Result userSkinReportOne(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index ffc34d8..c640347 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Map;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -99,4 +100,12 @@
@PostMapping(value = "/project/check/medical")
Result checkMedicalIitems(@RequestBody ProjectDto projectDto);
+ /**
+ * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ椤圭洰鍒楄〃
+ * @param projectDto
+ * @return
+ */
+ @PostMapping(value = "/project/list/by/type")
+ Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
new file mode 100644
index 0000000..345aff0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -0,0 +1,33 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.user.UserDto;
+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.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "questionnaire")
+public interface SQuestionnaireService {
+
+ /**
+ * 鑾峰彇璋冩煡闂嵎鎺ㄩ�佽褰曡鎯�
+ * @param dto 鐢ㄦ埛鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/get/sending-records/detail")
+ Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto);
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
new file mode 100644
index 0000000..45e0e98
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java
@@ -0,0 +1,53 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.consultation.ConsultRecordDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-consult")
+public interface SPhipConsultationService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鏂板/淇敼
+ */
+ @PostMapping(value = "/consultation/record/add/or/edit")
+ Result addOrEditConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鍒犻櫎
+ */
+ @PostMapping(value = "/consultation/record/del")
+ Result delConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍜ㄨ璁板綍鍒楄〃
+ */
+ @PostMapping(value = "/consultation/record/user/list")
+ Result listConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+ /**
+ * 寮�鏀惧钩鍙�- 鑾峰彇涓婁竴娆¤褰曢儴鍒嗗瓧娈�
+ */
+ @PostMapping(value = "/consultation/record/last/detail")
+ Result lastDetailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�- 璇︽儏
+ */
+ @PostMapping(value = "/consultation/record/detail")
+ Result detailConsult(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍒掓墸椤圭洰鍒楄〃
+ */
+ @PostMapping(value = "/consultation/record/deduction/project/list")
+ Result deductionProList(@RequestBody ConsultRecordDto consultRecordNewDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index 0c30dc8..d9da89b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.coupon.CouponSendDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,12 @@
Result sendUserCoupon(@RequestBody CouponDto couponDto);
/**
+ * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+ */
+ @PostMapping(value = "/coupon/send/coupon/by/money")
+ Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
*/
@PostMapping(value = "/coupon/cancel/coupon")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index a3397c3..b959c4d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -65,4 +65,10 @@
*/
@PostMapping(value = "/deduction/delete")
Result deleteData(@RequestBody DeductionDto dto);
+
+ /**
+ * 鍒掓墸鏈悗鎻愮ず鍗￠�氱煡鑾峰彇鏁版嵁
+ */
+ @PostMapping(value = "/deduction/postoperative/card/info")
+ Result postoperativeCardInfo(@RequestBody DeductionDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
new file mode 100644
index 0000000..809ec04
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -0,0 +1,29 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.MarketActivityDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢娲诲姩service
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-market-activity")
+public interface SPhipMarketActivityService {
+
+ /** 鍒楄〃 */
+ @PostMapping(value = "/market/activity/list")
+ Result list(@RequestBody MarketActivityDto dto);
+
+ /** 璇︽儏 */
+ @PostMapping(value = "/market/activity/detail")
+ Result detail(@RequestBody MarketActivityDto dto);
+
+ /** 棰嗗彇浼樻儬鍒� */
+ @PostMapping(value = "/market/activity/receiveCoupon")
+ Result receiveCoupon(@RequestBody MarketActivityDto dto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java
new file mode 100644
index 0000000..d8297f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserInfoCompleteService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.user.usercompleteInfo.UserInfoCompleteDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-complete")
+
+public interface SPhipUserInfoCompleteService {
+
+
+ /**
+ * 寮�鏀惧钩鍙�-澶勭悊鎵爜鐢ㄦ埛瀹屽杽璧勬枡椤典俊鎭� (缂栬緫)
+ */
+ @PostMapping(value = "/user/complete/edit")
+ Result userCompleteEdit(@RequestBody UserInfoCompleteDto userInfoCompleteDto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-灞曠ず 瀹屽杽璧勬枡椤佃鎯呮暟鎹�
+ */
+ @PostMapping(value = "/user/complete/detail")
+ Result userCompleteDetail(@RequestBody UserInfoCompleteDto userInfoCompleteDto);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index 743ccb4..9fd2c62 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.user.money.PhisUserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyUpdateDto;
+import com.hz.his.dto.user.money.UserTurnDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -43,4 +44,10 @@
*/
@PostMapping(value = "/user/money/log/use/info")
Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾杞禒
+ */
+ @PostMapping(value = "/user/money/turn")
+ Result userMoneyTurn(@RequestBody UserTurnDto userTurnDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
new file mode 100644
index 0000000..3ab1a6f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activityData.ActivityReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 鍗囧崟鎶ヨ〃
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-activity-report")
+public interface BiActivityReportService {
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/activity/report/export")
+ Result export(@RequestBody ActivityReportDto activityReportDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
new file mode 100644
index 0000000..b8ec30d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
@@ -0,0 +1,42 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 棰勭害鍒拌鍒嗘瀽鎶ヨ〃
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-arrive-report")
+public interface BiArriveReportService {
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁
+ */
+ @PostMapping("/report/arrive/shop/list")
+ Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�
+ */
+ @PostMapping("/report/arrive/employee/list")
+ Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/shop/list/export")
+ Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/employee/list/export")
+ Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index a5677db..0efd929 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -84,9 +84,20 @@
/**
* 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
- * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
*/
@PostMapping("/admin/export/employee/oldNew/report")
Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃
+ */
+ @PostMapping("/admin/export/employee/cycle/week/list")
+ Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃-瀵煎嚭
+ */
+ @PostMapping("/admin/export/employee/cycle/week/list/export")
+ Result cycleWeekListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index 6f2fbd0..c484ce3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -116,5 +116,9 @@
@PostMapping("/admin/consultant/report/room/list")
Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-鍜ㄨ甯�-鍒濊瘖鎴愪氦鐜� */
+ @PostMapping("/admin/consultant/report/first/user/rate/export")
+ Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
new file mode 100644
index 0000000..fa28a2e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 鍜ㄨ甯堣瘎鍒嗘姤琛�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-source")
+public interface BiConsultantSourceService {
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃 */
+ @PostMapping("/admin/consultant/report/source/list")
+ Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃-瀵煎嚭 */
+ @PostMapping("/admin/consultant/report/source/emp/source/export")
+ Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+
+ /*** 鍜ㄨ甯�-鎺掑悕-瀵煎嚭 */
+ @PostMapping("/admin/consultant/report/source/shop/emp/source/export")
+ Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
new file mode 100644
index 0000000..cb348d7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -0,0 +1,123 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 鍖荤敓蹇姤
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf-sale")
+public interface BiDoctorSaleService {
+
+ /**
+ * 鍖荤敓-涓氱哗鎬诲垪琛�
+ */
+ @PostMapping("/admin/doctor/sale/report/deduction/total/list")
+ Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鍖荤敓-鎵ц涓氱哗鏁版嵁-鍒嗛棬搴�
+ */
+ @PostMapping("/admin/doctor/sale/report/deduction/shop/list")
+ Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓-鏍稿績椤圭洰鍗犳瘮鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/core/project/list")
+ Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓-鏍稿績椤圭洰涓氱哗杩借釜
+ */
+ @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
+ Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鎵ц椤圭洰-鍒嗙被
+ */
+ @PostMapping("/admin/doctor/sale/report/project/type/list")
+ Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎵ц椤圭洰-鍒嗙被鑱斿悎娌荤枟
+ */
+ @PostMapping("/admin/doctor/sale/report/project/combination/therapy/list")
+ Result combinationTherapy(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鎵ц閮ㄤ綅
+ */
+ @PostMapping("/admin/doctor/sale/report/project/body/list")
+ Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 娴佸け鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/user/list")
+ Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」娴佸け棰勮-椤圭洰
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/project/list")
+ Result lossProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」娴佸け棰勮-钀ラ攢
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/project/market/list")
+ Result lossProjectMarketList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 娌荤枟鏍囩浼氬憳鏁伴噺
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/label/info/list")
+ Result treatLabelInfoList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+
+
+
+
+
+ /**
+ * 鎵ц椤圭洰-SPU鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/project/spu/list")
+ Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓娌荤枟浼氬憳鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/user/list")
+ Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/all/list")
+ Result allList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 椤鹃棶鍏崇郴鎵ц鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/consultant/deduction/list")
+ Result userDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎺ㄨ崘椤惧绛夌骇鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/user/list")
+ Result inviteList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index d42e81e..153efc7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -82,6 +82,12 @@
@PostMapping("/admin/operational/channels/deal")
Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-娓犻亾鎬讳俊鎭�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/channels/deal/export")
+ Result channelsDealExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
/**
* 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-鏂板獟浣撴矇鐫″娓犻亾鐜伴噾涓氱哗
@@ -94,6 +100,12 @@
*/
@PostMapping("/admin/operational/shop/channels")
Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-闂ㄨ瘖鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/shop/channels/export")
+ Result shopChannelsExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
/**
* 闂ㄥ簵&鍜ㄨ甯堣�佸甫鏂伴澶╂垚浜ら噾棰濆垎鏋�
@@ -149,5 +161,10 @@
@PostMapping("/admin/operational/month/deduction/list")
Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * SPA浠ｇ帇涓氱哗鎶ヨ〃
+ */
+ @PostMapping("/admin/operational/channels/deal/dw/spa")
+ Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
new file mode 100644
index 0000000..28407e3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -0,0 +1,39 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import com.hz.his.dto.report.ShopReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+/**
+ * 闂ㄥ簵鏃ユ姤琛�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-spa")
+public interface BiShopSPAService {
+
+ /**
+ * 鏃ユ姤琛�-褰撴棩鍚勪笟缁╂寚鏍�
+ * ShopAchievementVo
+ */
+ @PostMapping("/admin/export/shop/spa/day/indicators")
+ Result dayIndicators(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * SPA鍜ㄨ甯堜笟缁╂棩鎶ヨ〃
+ * EmployeeReportDto
+ */
+ @RequestMapping("/admin/export/shop/spa/employee/indicators/list")
+ Result employeeIndicatorsList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * SPA椤圭洰鎸囨爣鏁版嵁
+ * ShopImportantProjectVo
+ */
+ @PostMapping("/admin/export/shop/spa/project/indicators/list")
+ Result projectIndicatorsList(@RequestBody ShopReportDto shopReportDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java
new file mode 100644
index 0000000..b63224b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/compare/SComparePhoteService.java
@@ -0,0 +1,74 @@
+package com.hz.his.feign.service.platform.compare;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.compare.CompareDeleteVo;
+import com.hz.his.vo.compare.CompareListVo;
+import com.hz.his.vo.compare.CompareVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**瀵规瘮鐓eign
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ * @author CJH
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "compare-photo")
+public interface SComparePhoteService {
+
+ /**鍒楄〃
+ * @param compareListVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/list")
+ Result listData(@RequestBody CompareListVo compareListVo);
+
+
+ /**鏂板瀵规瘮鐓�
+ * @param compareVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/add")
+ Result add(@RequestBody CompareVo compareVo);
+
+ /**鏌ョ湅瀵规瘮鐓�
+ * @param compareListVo 浼犲弬缁撴瀯
+ * @return data杞寲涓篊ompareDataVo
+ */
+ @PostMapping(value = "/compare/photo/record/see")
+ Result see(@RequestBody CompareListVo compareListVo);
+
+ /**鏇存柊瀵规瘮鐓�
+ * @param compareVo 浼犲弬缁撴瀯
+ */
+ @PostMapping(value = "/compare/photo/record/update")
+ Result update(@RequestBody CompareVo compareVo);
+
+ /**鍒犻櫎瀵规瘮鐓ф�昏褰�
+ * @param compareDeleteVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/delete")
+ Result delete(@RequestBody CompareDeleteVo compareDeleteVo);
+
+ /**鍒犻櫎瀵规瘮鐓у瓙鍗�
+ * @param compareDeleteVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/delete/item")
+ Result deleteItem(@RequestBody CompareDeleteVo compareDeleteVo);
+
+ /**鑾峰彇鐢ㄦ埛椤圭洰
+ * @param compareListVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/user/project")
+ Result userProjectSearchList(@RequestBody CompareListVo compareListVo);
+
+ /**鑾峰彇鐢ㄦ埛鍒掓墸
+ * @param compareListVo 浼犲弬缁撴瀯
+ * @return
+ */
+ @PostMapping(value = "/compare/photo/record/deduction/project")
+ Result userDeductionSearchList(@RequestBody CompareListVo compareListVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
new file mode 100644
index 0000000..82eee24
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.platform.payment;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.order.refund.qr.RefundQrVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "c-notify-r")
+public interface SConsumeNotifyRefundService {
+
+ /**
+ * 璁㈠崟浜岀淮鐮佽皟璧烽��娆�
+ * 閽堝鏈敮浠樼殑璁㈠崟锛屼絾鏄凡缁忎娇鐢ㄤ簡璁㈠崟浜岀淮鐮佹敮浠�
+ * data浣跨敤 RefundQrResponseVo 杞寲
+ */
+ @PostMapping(value = "/order/qr/refund")
+ Result orderQrRefund(@RequestBody RefundQrVo refundQrVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
index d02644e..6a7b91f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform.payment;
import com.hx.resultTool.Result;
-import com.hz.his.vo.payment.PayNoVo;
+import com.hz.phis.vo.payment.PayNoVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -13,8 +13,8 @@
public interface SPayNoService {
/**
- * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
- * data灏辨槸鏀粯缂栧彿
+ * 鑾峰彇鏀粯缂栧彿
+ * data灏辨槸杞� PayNoResVo
*/
@PostMapping(value = "/pay/create")
Result payCreate(@RequestBody PayNoVo payNoVo);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
new file mode 100644
index 0000000..cdbb1ab
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.platform.payment;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.payment.qr.OrderQrPayVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "payment-qr")
+public interface SPaymentService {
+
+ /**
+ * 璇锋眰璁㈠崟浜岀淮鐮佹敮浠�
+ * data杞寲瀵硅薄 OrderQrResponeVo
+ */
+ @PostMapping(value = "/payment/order/qr")
+ Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/quotation/SPhipQuotationService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/quotation/SPhipQuotationService.java
new file mode 100644
index 0000000..1eac87f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/quotation/SPhipQuotationService.java
@@ -0,0 +1,48 @@
+package com.hz.his.feign.service.platform.quotation;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.quotation.QuotationDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 鎶ヤ环鍗晄ervice
+ * @USER: fhx
+ * @DATE: 2023/8/8
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-quotation")
+public interface SPhipQuotationService {
+
+ /** 鍒楄〃淇℃伅鎺ュ彛 */
+ @PostMapping("/quotation/list")
+ Result list(@RequestBody QuotationDto dto);
+
+ /** 鏂板淇℃伅鎺ュ彛 */
+ @PostMapping("/quotation/addInfo")
+ Result addInfo(@RequestBody QuotationDto dto);
+
+ /** 缂栬緫淇℃伅鎺ュ彛 */
+ @PostMapping("/quotation/editInfo")
+ Result editInfo(@RequestBody QuotationDto dto);
+
+ /** 鏂板鎶ヤ环鍗� */
+ @PostMapping("/quotation/add")
+ Result add(@RequestBody QuotationDto dto);
+
+ /** 缂栬緫鎶ヤ环鍗� */
+ @PostMapping("/quotation/edit")
+ Result edit(@RequestBody QuotationDto dto);
+
+ /** 鍒犻櫎鎶ヤ环鍗� */
+ @PostMapping("/quotation/del")
+ Result del(@RequestBody QuotationDto dto);
+
+ /** CRM鎶ヤ环鍗曚俊鎭� */
+ @PostMapping("/quotation/crmQuotationInfo")
+ Result crmQuotationInfo(@RequestBody QuotationDto dto);
+
+ /** 寮�鍗曟暟鎹� */
+ @PostMapping("/quotation/openOrderData")
+ Result openOrderData(@RequestBody QuotationDto dto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 9840bb7..243414e 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -1,14 +1,10 @@
package com.hz.his.vo.bi.revenue;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
*鏀跺叆纭琛ㄦ煡璇�
@@ -16,7 +12,10 @@
*/
@Data
public class RevenueQuery{
-
+ /**椤垫暟*/
+ private Integer pageNum;
+ /**鏉℃暟*/
+ private Integer pageSize;
/**鍏朵粬鏌ヨ*/
private String KeyWord;
/**鐢ㄦ埛CIQ*/
@@ -39,520 +38,425 @@
private Date startCreateTime;
/**鍒涘缓鏃ユ湡*/
private Date endCreateTime;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
/**璇锋眰鎿嶄綔浜�*/
private String operatorId;
/**璇锋眰鎿嶄綔浜�*/
private String operatorName;
- @Column(comment = "鏉ユ簮绫诲瀷", length = 2, type = MySqlTypeConstant.INT, isNull = false)
+
+
+
+
+ /**鏉ユ簮绫诲瀷*/
private Integer sourceType;
- @Column(comment = "鏉ユ簮绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 10)
+ /**鏉ユ簮绫诲瀷鍚嶇О*/
private String sourceTypeName;
- @Index
- @Column(comment = "鏉ユ簮鏍囪瘑(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32, isNull = false)
+ /**鏉ユ簮鏍囪瘑*/
private String sourceId;
- @Column(comment = "鏉ユ簮缂栧彿(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**鏉ユ簮缂栧彿(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)*/
private String sourceNo;
- @Index
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(comment = "鏉ユ簮涓氱哗鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+ /**鏉ユ簮涓氱哗鏃堕棿*/
private Date sourceTime;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(comment = "鏉ユ簮鍒涘缓鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+ /**鏉ユ簮鍒涘缓鏃堕棿*/
private Date sourceCreateTime;
-
- @Column(comment = "鏉ユ簮鎬绘爣璇�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**鏉ユ簮鎬绘爣璇�*/
private String sourceGeneralId;
- @Column(comment = "鏉ユ簮鎬荤紪鍙�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**鏉ユ簮鎬荤紪鍙�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)*/
private String sourceGeneralNo;
-
- @Column(comment = "钀ラ攢鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**钀ラ攢鍒嗙被*/
private String marketingType;
- @Column(comment = "钀ラ攢鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**钀ラ攢鍒嗙被鍚嶇О*/
private String marketingTypeName;
-
- @Column(comment = "钀ラ攢鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 128)
+ /**钀ラ攢鍚嶇О*/
private String marketingName;
-
- @Column(comment = "鍩虹鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**鍩虹鍒嗙被*/
private String basicType;
- @Column(comment = "鍩虹鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍩虹鍒嗙被鍚嶇О*/
private String basicTypeName;
-
- @Column(comment = "涓�绾у垎绫�(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓�绾у垎绫�*/
private String firstLevelType;
- @Column(comment = "涓�绾у垎绫诲悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓�绾у垎绫诲悕绉�*/
private String firstLevelTypeName;
- @Column(comment = "浜岀骇鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浜岀骇鍒嗙被*/
private String secondLevelType;
- @Column(comment = "浜岀骇鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浜岀骇鍒嗙被鍚嶇О*/
private String secondLevelTypeName;
- @Column(comment = "鍒嗙被鐖剁被鍖呮嫭鑷繁JSON锛屾牸寮�:[{\"id\":\"娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\",\"parentId\":\"鐖剁被鏍囪瘑\"}]", type = MySqlTypeConstant.TEXT,isNull = false)
+ /**鍒嗙被鐖剁被鍖呮嫭鑷繁JSON*/
private String classifyJson = "[]";
-
- @Index
- @Column(comment = "椤圭洰id/鍟嗗搧id锛堝叕鐢ㄦ爣璇嗭級", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰id*/
private String commonId;
- @Column(comment = "椤圭洰缂栧彿/鍟嗗搧缂栫爜", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰缂栧彿/鍟嗗搧缂栫爜*/
private String commonNo;
- @Column(comment = "椤圭洰鍚嶇О/鍟嗗搧鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰鍚嶇О/鍟嗗搧鍚嶇О*/
private String commonName;
-
- @Column(comment = "瑙勬牸", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**瑙勬牸*/
private String specification;
- @Column(comment = "璧勮川", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**璧勮川*/
private String qualification;
- @Column(comment = "椤圭洰鍗曚綅", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**椤圭洰鍗曚綅*/
private String unit;
-
- @Column(comment = "绉戝缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**绉戝缂栧彿*/
private String departmentCode;
- @Column(comment = "绉戝鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**绉戝鍚嶇О*/
private String departmentName;
-
- @Column(comment = "浠锋牸鏍囩", length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**浠锋牸鏍囩*/
private String priceTag;
-
- @Index
- @Column(comment = "鏀惰垂璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂璁㈠崟id*/
private String payOrderId;
- @Column(comment = "鏀惰垂鍗曞彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍗曞彿*/
private String payOrderNo;
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- @Column(comment="缁撶畻鏃堕棿(鏀惰垂鏃ユ湡)",type = MySqlTypeConstant.DATETIME)
+ /**缁撶畻鏃堕棿(鏀惰垂鏃ユ湡)*/
private Date orderTime;
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
- @Column(comment="鎵ц鏃ユ湡",type = MySqlTypeConstant.DATETIME)
+ /**鎵ц鏃ユ湡*/
private Date deductionTime;
-
- @Column(comment = "涓氬姟绫诲瀷(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**涓氬姟绫诲瀷*/
private String businessType;
- @Column(comment = "涓氬姟绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**涓氬姟绫诲瀷鍚嶇О*/
private String businessTypeName;
-
- @Index
- @Column(comment = "鐢ㄦ埛id", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**鐢ㄦ埛id*/
private String userId;
- @Column(comment = "浼氬憳鍙�(鐢ㄦ埛缂栧彿)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳鍙�(鐢ㄦ埛缂栧彿)*/
private String memberNO;
- @Column(comment = "CIQ", length = 64, type = MySqlTypeConstant.VARCHAR)
private String memberCIQ;
- @Column(comment = "鐥呬緥鍙�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐥呬緥鍙�*/
private String memberCaseNo;
- @Column(comment = "瀹㈡埛绫诲埆", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛绫诲埆*/
private String userClass;
- @Column(comment="鏄惁棣栨鎵ц", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁棣栨鎵ц*/
private Integer isFirstDeduction;
- @Column(comment="浼氬憳绛夌骇", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳绛夌骇*/
private String userLevel;
- @Column(comment="鐢ㄦ埛鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鍚嶇О*/
private String userName;
- @Column(comment="鍏变韩瀹㈡埛", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鍏变韩瀹㈡埛*/
private Integer shareCustomer;
- @Column(comment = "瀹㈡埛绫诲瀷", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛绫诲瀷*/
private String userType;
-
- @Column(comment = "鐧昏浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鐧昏浜虹被鍨�*/
private Integer registrantType;
- @Index
- @Column(comment = "鐧昏浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐧昏浜篒d*/
private String registrantId;
- @Column(comment = "鐧昏浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐧昏浜哄悕绉�*/
private String registrantName;
-
- @Index
- @Column(comment = "鎵ц鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍖荤敓Id*/
private String deductionDoctorId;
- @Column(comment = "鎵ц鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍖荤敓鍚嶇О*/
private String deductionDoctorName;
-
- @Index
- @Column(comment = "鍔╃悊鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍔╃悊鍖荤敓Id*/
private String assistantDoctorId;
- @Column(comment = "鍔╃悊鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鍔╃悊鍖荤敓鍚嶇О*/
private String assistantDoctorName;
-
- @Index
- @Column(comment = "缇庡甯圛d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**缇庡甯圛d*/
private String beauticianId;
- @Column(comment = "缇庡甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**缇庡甯堝悕绉�*/
private String beauticianName;
-
- @Index
- @Column(comment = "璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟id*/
private String orderId;
- @Column(comment = "璁㈠崟缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟缂栧彿*/
private String orderNo;
-
- @Index
- @Column(comment = "璁㈠崟鏉＄爜id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鏉＄爜id*/
private String orderItemId;
- @Column(comment = "璁㈠崟鏉＄爜缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鏉＄爜缂栧彿*/
private String orderItemNo;
-
- @Column(comment = "寮�鍗曚汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍗曚汉绫诲瀷*/
private Integer orderOpType;
- @Index
- @Column(comment = "寮�鍗曚汉Id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曚汉Id*/
private String orderOpId;
- @Column(comment = "寮�鍗曚汉鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曚汉鍚嶇О*/
private String orderOpName;
-
-
- @Column(comment = "寮�鍙戜汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍙戜汉绫诲瀷*/
private Integer developOpType;
- @Column(comment = "寮�鍙戜汉Id", type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍙戜汉Id*/
private String developOpId;
- @Column(comment = "寮�鍙戜汉鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍙戜汉鍚嶇О*/
private String developOpName;
-
- @Column(comment = "寮�鍙戜汉闂ㄥ簵鏍囪瘑", type = MySqlTypeConstant.VARCHAR,length = 64)
+ /**寮�鍙戜汉闂ㄥ簵鏍囪瘑*/
private String developShopId;
- @Column(comment = "寮�鍙戜汉闂ㄥ簵鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 64)
+ /**寮�鍙戜汉闂ㄥ簵鍚嶇О*/
private String developShopName;
-
- @Column(comment = "鎵�灞炲挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎵�灞炲挩璇㈠笀绫诲瀷*/
private Integer belongConsultantType;
- @Index
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀id(Employee id) 鐢ㄦ埛鍒掓墸鏃剁殑鎵�灞炲挩璇㈠笀", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀id(Employee id) 鐢ㄦ埛鍒掓墸鏃剁殑鎵�灞炲挩璇㈠笀*/
private String belongConsultantId;
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀鍚嶇О*/
private String belongConsultantName;
-
- @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鎵�灞為棬搴椾俊鎭�", type = MySqlTypeConstant.LONGTEXT)
+ /**鐢ㄦ埛鎵�灞炲挩璇㈠笀鎵�灞為棬搴椾俊鎭�*/
private String belongConsultantShopInfo;
-
- @Column(comment = "寮�鍗曞挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**寮�鍗曞挩璇㈠笀绫诲瀷*/
private Integer orderConsultantType;
- @Index
- @Column(comment = "寮�鍗曞挩璇㈠笀id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曞挩璇㈠笀id*/
private String orderConsultantId;
- @Column(comment = "寮�鍗曞挩璇㈠笀鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**寮�鍗曞挩璇㈠笀鍚嶇О*/
private String orderConsultantName;
-
- @Column(comment = "鏀堕摱鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鏀堕摱鍜ㄨ甯堢被鍨�*/
private Integer cashierConsultantType;
- @Index
- @Column(comment = "鏀堕摱鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱鍜ㄨ甯坕d*/
private String cashierConsultantId;
- @Column(comment = "鏀堕摱鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱鍜ㄨ甯堝悕绉�*/
private String cashierConsultantName;
-
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉扮被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎺ヨ瘖鍜ㄨ甯堝悕绉扮被鍨�*/
private Integer receptionConsultantType;
- @Index
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎺ヨ瘖鍜ㄨ甯坕d*/
private String receptionConsultantId;
- @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎺ヨ瘖鍜ㄨ甯堝悕绉�*/
private String receptionConsultantName;
-
- @Column(comment = "鎵ц鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**鎵ц鍜ㄨ甯堢被鍨�*/
private Integer deductionConsultantType;
- @Index
- @Column(comment = "鎵ц鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍜ㄨ甯坕d*/
private String deductionConsultantId;
- @Column(comment = "鎵ц鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎵ц鍜ㄨ甯堝悕绉�*/
private String deductionConsultantName;
-
- @Column(comment = "鏀跺叆璁″叆", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆璁″叆*/
private String revenueRecordedType;
- @Column(comment = "鏀跺叆璁″叆鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆璁″叆鍚嶇О*/
private String revenueRecordedName;
-
- @Column(comment = "鏀跺叆涓讳綋", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆涓讳綋*/
private String revenueSubjectType;
- @Column(comment = "鏀跺叆涓讳綋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀跺叆涓讳綋鍚嶇О*/
private String revenueSubjectName;
-
- @Column(comment = "鍘熷崟浠�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鍘熷崟浠�*/
private BigDecimal originalPrice = BigDecimal.ZERO;
- @Column(comment = "鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+ /**鏁伴噺*/
private Integer quantity;
- @Column(comment = "鏈墽琛屾鏁�", type = MySqlTypeConstant.INT)
+ /**鏈墽琛屾鏁�*/
private Integer notUsedNum;
-
- @Column(comment = "鎶樻墸", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鎶樻墸*/
private BigDecimal discount = BigDecimal.ZERO;
- @Column(comment = "鎶樺悗閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鎶樺悗閲戦*/
private BigDecimal discountAmount = BigDecimal.ZERO;
- @Column(comment = "鏀堕摱閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鏀堕摱閲戦*/
private BigDecimal cashierAmount = BigDecimal.ZERO;
-
- @Column(comment="鏄惁娆犺垂", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁娆犺垂*/
private Integer isArrears;
- @Column(comment = "棰勫畾閲�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**棰勫畾閲�*/
private BigDecimal deposit = BigDecimal.ZERO;
- @Column(comment = "鍌ㄥ�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鍌ㄥ�奸噾*/
private BigDecimal storedValueFund = BigDecimal.ZERO;
- @Column(comment = "澧炲�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**澧炲�奸噾*/
private BigDecimal valueAddedFund = BigDecimal.ZERO;
- @Column(comment = "绉垎", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绉垎*/
private BigDecimal integral = BigDecimal.ZERO;
- @Column(comment = "绉垎閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绉垎閲戦*/
private BigDecimal integralAmount = BigDecimal.ZERO;
- @Column(comment = "铏氭嫙閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**铏氭嫙閲戦*/
private BigDecimal virtualAmount = BigDecimal.ZERO;
-
- @Column(comment = "涓氱哗鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**涓氱哗鎬婚*/
private BigDecimal performanceTotal = BigDecimal.ZERO;
- @Column(comment = "涓氱哗涓嶅惈绋�", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**涓氱哗涓嶅惈绋�*/
private BigDecimal performanceNotHasTax;
- @Column(comment = "绋庨", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**绋庨*/
private BigDecimal taxAmount;
-
- @Column(comment = "鏍囧噯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鏍囧噯鑰楁潗鎴愭湰*/
private BigDecimal standardConsumablesCost = BigDecimal.ZERO;
- @Column(comment = "瀹為檯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**瀹為檯鑰楁潗鎴愭湰*/
private BigDecimal actualConsumablesCost = BigDecimal.ZERO;
-
- @Column(comment = "娓犻亾鍒嗙被鏍囪瘑(ChannelsType)(蹇呭～锛屼唬鐮佸垽鏂�)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍒嗙被鏍囪瘑*/
private String channelsTypeId;
- @Column(comment = "娓犻亾鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍒嗙被鍚嶇О*/
private String channelsTypeName;
- @Column(comment = "娓犻亾鏍囪瘑", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鏍囪瘑*/
private String channelId;
- @Column(comment = "娓犻亾鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚嶇О*/
private String channelName;
-
- @Column(comment = "娓犻亾鑱旂郴浜虹被鍨�", length = 4, type = MySqlTypeConstant.TINYINT)
+ /**娓犻亾鑱旂郴浜虹被鍨�*/
private Integer channelContactType;
- @Index
- @Column(comment = "娓犻亾鑱旂郴浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鑱旂郴浜篒d*/
private String channelContactId;
- @Column(comment = "娓犻亾鑱旂郴浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鑱旂郴浜哄悕绉�*/
private String channelContactName;
-
- @Column(comment = "娓犻亾鍚堜綔浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**娓犻亾鍚堜綔浜虹被鍨�*/
private Integer channelPartnerType;
- @Index
- @Column(comment = "娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚堜綔浜篒d*/
private String channelPartnerId;
- @Column(comment = "娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娓犻亾鍚堜綔浜哄悕绉�*/
private String channelPartnerName;
-
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+ /**璇婃墍鍐呴儴鑱旂粶浜虹被鍨�*/
private Integer internalContactType;
- @Index
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璇婃墍鍐呴儴鑱旂粶浜篒d*/
private String internalContactId;
- @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璇婃墍鍐呴儴鑱旂粶浜哄悕绉�*/
private String internalContactName;
-
- @Column(comment = "鐢电綉鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢电綉鍜ㄨ甯坕d*/
private String tmkServiceId;
- @Column(comment = "鐢电綉鍜ㄨ甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢电綉鍜ㄨ甯堝悕绉�*/
private String tmkServiceName;
-
- @Column(comment = "瀹㈡湇id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡湇id*/
private String chatCorpUserId;
- @Column(comment = "瀹㈡湇鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡湇鍚嶇О*/
private String chatCorpUserName;
-
- @Column(comment = "鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎶ゅ＋id*/
private String nurseCorpUserId;
- @Column(comment = "鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鎶ゅ＋鍚嶇О*/
private String nurseCorpUserName;
-
- @Column(comment = "娲楁墜鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娲楁墜鎶ゅ＋id*/
private String handWashNurseId;
- @Column(comment = "娲楁墜鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**娲楁墜鎶ゅ＋鍚嶇О*/
private String handWashNurseName;
-
- @Column(comment = "宸″洖鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**宸″洖鎶ゅ＋id*/
private String circuitingNurseId;
- @Column(comment = "宸″洖鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**宸″洖鎶ゅ＋鍚嶇О*/
private String circuitingNurseName;
-
- @Column(comment = "閰嶅彴鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**閰嶅彴鎶ゅ＋id*/
private String tableNurseId;
- @Column(comment = "閰嶅彴鎶ゅ＋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**閰嶅彴鎶ゅ＋鍚嶇О*/
private String tableNurseName;
-
- @Column(comment = "楹婚唹甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**楹婚唹甯坕d*/
private String anesthesiologistId;
- @Column(comment = "楹婚唹甯堝悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**楹婚唹甯堝悕绉�*/
private String anesthesiologistName;
-
- @Column(comment = "鐤楃▼鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+ /**鐤楃▼鎬婚*/
private BigDecimal treatmentTotal;
-
- @Column(comment = "TMK鐧昏浜篿d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**TMK鐧昏浜篿d*/
private String tmkRegistrantId;
- @Column(comment = "TMK鐧昏浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**TMK鐧昏浜哄悕绉�*/
private String tmkRegistrantName;
-
- @Column(comment = "鏀惰垂鍛榠d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍛榠d*/
private String chargeId;
- @Column(comment = "鏀惰垂鍛樺悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀惰垂鍛樺悕绉�*/
private String chargeName;
-
- @Column(comment = "鏈嶅姟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏈嶅姟闂ㄥ簵id*/
private String serviceShopId;
- @Column(comment = "鏈嶅姟闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏈嶅姟闂ㄥ簵鍚嶇О*/
private String serviceShopName;
-
- @Column(comment = "鐢ㄦ埛鎵�灞為棬搴梚d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞為棬搴梚d*/
private String belongShopId;
- @Column(comment = "鐢ㄦ埛鎵�灞為棬搴楀悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鐢ㄦ埛鎵�灞為棬搴楀悕绉�*/
private String belongShopName;
-
- @Column(comment = "涓嬪崟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓嬪崟闂ㄥ簵id*/
private String orderShopId;
- @Column(comment = "涓嬪崟闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓嬪崟闂ㄥ簵鍚嶇О*/
private String orderShopName;
-
- @Column(comment = "鏀堕摱闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱闂ㄥ簵id*/
private String cashierShopId;
- @Column(comment = "鏀堕摱闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**鏀堕摱闂ㄥ簵鍚嶇О*/
private String cashierShopName;
-
- @Column(comment = "鏀惰垂澶囨敞", type = MySqlTypeConstant.TEXT)
+ /**鏀惰垂澶囨敞*/
private String chargeRemark;
-
- @Column(comment = "钀ラ攢鏍囩", type = MySqlTypeConstant.TEXT)
+ /**钀ラ攢鏍囩*/
private String marketingTag;
-
- @Column(comment="鏄惁杞瘖杞枟", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁杞瘖杞枟*/
private Integer isTurn;
- @Column(comment="鏄惁鍙墽琛岄」鐩�", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁鍙墽琛岄」鐩�*/
private Integer isDeductionProject;
- @Column(comment="鏄惁鐤楃▼椤圭洰", length = 1, type = MySqlTypeConstant.INT)
+ /**鏄惁鐤楃▼椤圭洰*/
private Integer isTreatmentProject;
-
- @Column(comment = "璐拱鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+ /**璐拱鏁伴噺*/
private Integer buyNum;
- @Column(comment = "鐤楃▼娆℃暟", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼娆℃暟*/
private Integer treatmentNum;
- @Column(comment = "鐤楃▼鎬绘暟", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼鎬绘暟*/
private Integer treatmentTotality;
- @Column(comment = "鐤楃▼搴忓彿", type = MySqlTypeConstant.INT,length = 11)
+ /**鐤楃▼搴忓彿*/
private Integer treatmentNo;
-
- @Column(comment = "鍒掓墸澶囨敞", type = MySqlTypeConstant.TEXT)
+ /**鍒掓墸澶囨敞*/
private String deductionRemark;
- @Column(comment = "鍏嶅崟鍘熷洜", type = MySqlTypeConstant.TEXT)
+ /**鍏嶅崟鍘熷洜*/
private String freeReason;
-
- @Column(comment = "涓氱哗绫诲埆(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, isNull = false)
+ /**涓氱哗绫诲埆*/
private String performanceCategory;
- @Column(comment = "涓氱哗绫诲埆鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**涓氱哗绫诲埆鍚嶇О*/
private String performanceCategoryName;
-
- @Column(comment = "璁㈠崟绫诲瀷(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷*/
private String orderType;
- @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷鍚嶇О*/
private String orderTypeName;
-
- @Column(comment = "璁㈠崟鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鍒嗙被*/
private int orderClassify;
- @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟绫诲瀷鍚嶇О*/
private String orderClassifyName;
-
- @Column(comment = "瀹㈡埛鎴愪氦鏍囩", type = MySqlTypeConstant.TEXT)
+ /**瀹㈡埛鎴愪氦鏍囩*/
private String customerTransactionTag;
-
- @Column(comment = "璁㈠崟娓犻亾鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍒嗙被鍚嶇О*/
private String orderChannelsTypeName;
-
- @Column(comment = "璁㈠崟涓�绾у垎绫�(OrderItemConstants) 娓犻亾涓轰竴绾ф笭閬搃d 浼氬憳濉啓绌�", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟涓�绾у垎绫�*/
private String orderFirstLevelType;
- @Column(comment = "璁㈠崟涓�绾у垎绫诲悕绉�", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟涓�绾у垎绫诲悕绉�*/
private String orderFirstLevelTypeName;
- @Column(comment = "璁㈠崟娓犻亾鐨刯son锛屾墍鏈夌埗绫诲寘鎷嚜宸�:[{\"id\":\"娓犻亾鏍囪瘑\",\"parentId\":\"鐖剁被娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\"}]", type = MySqlTypeConstant.TEXT)
+ /**璁㈠崟娓犻亾鐨刯son*/
private String orderChannelJson = "[]";
- @Column(comment = "璁㈠崟娓犻亾涓�绾х紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х紪鍙�*/
private String orderChannel1No;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鏍囪瘑", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被鏍囪瘑*/
private String orderChannel1TypeId;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被缂栧彿*/
private String orderChannel1TypeNo;
- @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 50)
+ /**璁㈠崟娓犻亾涓�绾х殑鍒嗙被鍚嶇О*/
private String orderChannel1TypeName;
-
- @Column(comment = "璁㈠崟浜岀骇鍒嗙被(OrderItemConstants) 娓犻亾涓轰簩绾ф笭閬搃d", type = MySqlTypeConstant.VARCHAR, length = 64)
+ /**璁㈠崟浜岀骇鍒嗙被*/
private String orderSecondLevelType;
- @Column(comment = "璁㈠崟浜岀骇鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟浜岀骇鍒嗙被鍚嶇О*/
private String orderSecondLevelTypeName;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇缂栧彿*/
private String orderChannel2No;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勮仈绯讳汉鍚嶇О", length = 50, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾浜岀骇鐨勮仈绯讳汉鍚嶇О*/
private String orderChannel2Contacts;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄦ爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄦ爣璇�*/
private String orderChannel2Depart;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄥ悕绉�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄥ悕绉�*/
private String orderChannel2DepartName;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫绘爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫绘爣璇�*/
private String orderChannel2TypeId;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫荤紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫荤紪鍙�*/
private String orderChannel2TypeNo;
- @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫诲悕绉�", type = MySqlTypeConstant.VARCHAR, length = 50)
+ /**璁㈠崟娓犻亾浜岀骇鐨勫垎绫诲悕绉�*/
private String orderChannel2TypeName;
- @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍚堜綔浜篒d*/
private String orderChannelPartnerId;
- @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟娓犻亾鍚堜綔浜哄悕绉�*/
private String orderChannelPartnerName;
-
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫绘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄垎绫绘爣璇�*/
private String inviteeTypeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫诲悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄垎绫诲悕绉�*/
private String inviteeTypeName;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜烘爣璇�*/
private String inviteeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜虹紪鍙�*/
private String inviteeNo;
- @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**閭�璇蜂汉缂栧彿*/
private String inviteeCIQ;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜哄悕绉�*/
private String inviteeName;
-
- @Column(comment = "璁㈠崟鎺ㄨ崘浜虹被鍨�", length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜虹被鍨�*/
private String orderInviteeType;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜哄悕绉�*/
private String orderInviteeTypeName;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜烘爣璇�*/
private String orderInviteeId;
- @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**瀹㈡埛鎺ㄨ崘浜虹紪鍙�*/
private String orderInviteeNo;
- @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+ /**閭�璇蜂汉缂栧彿*/
private String orderInviteeCIQ;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜哄悕绉�*/
private String orderInviteeName;
- @Column(comment = "璁㈠崟鎺ㄨ崘浜鸿鑹蹭俊鎭�",length = 128, type = MySqlTypeConstant.VARCHAR)
+ /**璁㈠崟鎺ㄨ崘浜鸿鑹蹭俊鎭�*/
private String orderInviteeRoleInfo;
-
- @Index
- @Column(comment = "浼氬憳涓昏瘖鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳涓昏瘖鍖荤敓Id*/
private String attendingDoctorId;
- @Column(comment = "浼氬憳涓昏瘖鍖荤敓鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+ /**浼氬憳涓昏瘖鍖荤敓鍚嶇О*/
private String attendingDoctorName;
-
- @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 2, type = MySqlTypeConstant.INT, isNull = false, defaultValue = "0")
+ /**娌荤枟鍗曠被鍨�*/
private Integer treatOrderClassify;
- @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 32, type = MySqlTypeConstant.VARCHAR)
+ /**娌荤枟鍗曠被鍨�*/
private String treatOrderClassifyName;
-
- @Column(comment = "浼樻儬鍒稿彂鏀句汉" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿彂鏀句汉*/
private String couponIssuer;
- @Column(comment = "浼樻儬鍒稿彂鏀句汉瑙掕壊" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿彂鏀句汉瑙掕壊*/
private String couponIssuerRole;
- @Column(comment = "浼樻儬鍒稿悕绉�" ,type = MySqlTypeConstant.LONGTEXT)
+ /**浼樻儬鍒稿悕绉�*/
private String couponName;
-
- @Column(comment = "涓绘笭閬�" ,type = MySqlTypeConstant.LONGTEXT)
+ /**涓绘笭閬�*/
private String mainChannelName;
- @Column(comment = "鎵ц閮ㄤ綅" ,type = MySqlTypeConstant.LONGTEXT)
+ /**鎵ц閮ㄤ綅*/
private String deductionBodyPartInfo;
- /**椤垫暟*/
- private Integer pageNum;
- /**鏉℃暟*/
- private Integer pageSize;
+
public Integer getPageNum() {
if(pageNum == null){
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java
new file mode 100644
index 0000000..f1d5212
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataItemVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareDataItemVo {
+
+ /**瀵规瘮鐓у瓙鍗曟爣璇�*/
+ private String id;
+ /**瑙掑害绫诲瀷*/
+ private Integer angleType;
+ /**绫诲瀷 0鏈墠 1鏈悗 2鍙傝��*/
+ private Integer type;
+ /**鏂囦欢绫诲瀷*/
+ private Integer fileType;
+ /**鍥剧墖/瑙嗛鍦板潃*/
+ private String imgUrl;
+ /**鏄惁瀵瑰鎴峰彲瑙� 0 鍚� 1 鏄�*/
+ private Integer isShow;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java
new file mode 100644
index 0000000..6ecd0a0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDataVo.java
@@ -0,0 +1,81 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareDataVo {
+
+ /**瀵规瘮鐓ф爣璇�*/
+ private String id;
+ /**椤圭洰绗嚑娆′笂浼犲姣旂収*/
+ private Integer projectFrequency;
+ /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+ private String userProjectItemId;
+ /**鍒掓墸椤圭洰鏍囪瘑*/
+ private String deductionProjectId;
+ /**鍒掓墸鎬昏〃鏍囪瘑*/
+ private String deductionSingleId;
+ /**澶囨敞*/
+ private String remark;
+
+ /**鍒掓墸椤圭洰鍚嶇О*/
+ private String deductionProjectName;
+ /**鐢ㄦ埛椤圭洰鍚嶇О*/
+ private String userProjectItemName;
+
+ //----椤圭洰淇℃伅
+ /**椤圭洰鏍囪瘑*/
+ private String projectId;
+ /**椤圭洰浠锋牸*/
+ private BigDecimal curPrice;
+ /**椤圭洰鍚嶇О*/
+ private String projectName;
+ /**椤圭洰瑙勬牸*/
+ private String specification;
+
+ //----椤圭洰淇℃伅
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢ㄦ埛鍚嶇О*/
+ private String userName;
+ /**鐢ㄦ埛CIQ*/
+ private String CIQ;
+ /**鐢ㄦ埛浼氬憳缂栧彿*/
+ private String memberNO;
+ /**鐢ㄦ埛鐥呬緥缂栧彿*/
+ private String caseNO;
+
+ /**鍒掓墸鏃堕棿*/
+ private Date deductionTime;
+
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+
+ /**鏂板鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**鏂板鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鏂板鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+
+ /**鏈�鍚庡彉鏇存搷浣滀汉绫诲瀷*/
+ private Integer updateOpType;
+ /**鏈�鍚庡彉鏇存搷浣滀汉鏍囪瘑*/
+ private String updateOpId;
+ /**鏈�鍚庡彉鏇存搷浣滀汉鍚嶇О*/
+ private String updateOpName;
+
+ /**瀛愭暟鎹�*/
+ private List<CompareDataItemVo> compareItemList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java
new file mode 100644
index 0000000..9f820f2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareDeleteVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍒犻櫎瀹炰綋绫�
+ * @author CJH
+ */
+@Data
+public class CompareDeleteVo {
+
+ /**瀵规瘮鐓ф爣璇�*/
+ private String id;
+
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+
+ /**鍒犻櫎鐨勫瓙绫绘爣璇�*/
+ private List<String> compareItemList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java
new file mode 100644
index 0000000..8662b16
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareItemVo.java
@@ -0,0 +1,23 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被-鍥剧墖
+ * @author CJH
+ */
+@Data
+public class CompareItemVo {
+
+ /**瀵规瘮鐓�-瀛愯褰曟爣璇�*/
+ private String id;
+ /**绫诲瀷 0鏈墠 1鏈悗 2鍙傝��*/
+ private Integer type;
+ /**瑙掑害绫诲瀷*/
+ private Integer angleType;
+ /**鏂囦欢绫诲瀷锛堝浘鐗�/瑙嗛锛�*/
+ private Integer fileType;
+ /**鍥剧墖/瑙嗛閾炬帴*/
+ private String url;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
new file mode 100644
index 0000000..2ec5658
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareListVo.java
@@ -0,0 +1,51 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+/**
+ * 瀵规瘮鐓у垪琛ㄥ疄浣�
+ */
+@Data
+public class CompareListVo {
+
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize;
+
+ /**瀵规瘮鐓ф爣璇�*/
+ private String id;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**闋呯洰鏍囪瘑*/
+ private String projectId;
+ /**闋呯洰鍚嶇О*/
+ private String projectName;
+
+ /**鐢ㄦ埛闋呯洰鏍囪瘑*/
+ private String userProjectItemId;
+
+
+
+ public Integer getPageNum() {
+ if(pageNum == null){
+ pageNum = 1;
+ }
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ if(pageSize == null || pageSize > 500){
+ pageSize = 20;
+ }
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java
new file mode 100644
index 0000000..a02212d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/compare/CompareVo.java
@@ -0,0 +1,37 @@
+package com.hz.his.vo.compare;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鏂板鎴栬�呮洿鏂板疄浣撶被
+ * @author CJH
+ */
+@Data
+public class CompareVo {
+
+ /**瀵规瘮鐓ф爣璇�*/
+ private String id;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**椤圭洰鏍囪瘑*/
+ private String projectId;
+ /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+ private String userProjectItemId;
+ /**鍒掓墸椤圭洰鏍囪瘑*/
+ private String deductionProjectId;
+ /**鍒掓墸鎬昏〃鏍囪瘑*/
+ private String deductionSingleId;
+ /**澶囨敞*/
+ private String remark;
+
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+
+ /**瀛愭暟鎹�*/
+ private List<CompareItemVo> compareItemList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java
new file mode 100644
index 0000000..82d7797
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java
@@ -0,0 +1,28 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閫�娆�-浣滃簾鍒掓墸
+ * @author CJH
+ */
+@Data
+public class RefundDeductionCancelVo {
+
+ /**Y-鍒掓墸璁板綍缂栧彿*/
+ private String deductionNo;
+ /**Y-鍒掓墸椤圭洰璁板綍鏍囪瘑*/
+ private String deductionProjectId;
+ /**Y-鍒掓墸鎬昏褰曟爣璇�*/
+ private String deductionSingleId;
+ /**鎵�灞炵敤鎴烽」鐩�*/
+ private String userProjectItemId;
+
+ /**鍒掓墸閲戦锛堢郴缁熶紶鍊间娇鐢級*/
+ private BigDecimal deductionAmount;
+ /**鍒掓墸鏁伴噺锛堢郴缁熶紶鍊间娇鐢級*/
+ private Integer num;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java
new file mode 100644
index 0000000..a82a31e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.order.refund.qr;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**璁㈠崟浜岀淮鐮侀��娆捐繑鍥炲疄浣�
+ * @author CJH
+ */
+@Data
+public class RefundQrResponseVo {
+ /**Y-閫�娆剧紪鍙�*/
+ private String refudnNo;
+ /**Y-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /**Y-閫�娆鹃噾椤嶏紝蹇呴』鍜屾敮浠橀噾棰濅竴鏍�*/
+ private BigDecimal refundTotal;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java
new file mode 100644
index 0000000..ebeda76
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java
@@ -0,0 +1,22 @@
+package com.hz.his.vo.order.refund.qr;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**璁㈠崟浜岀淮鐮侀��娆惧疄浣�
+ * @author CJH
+ */
+@Data
+public class RefundQrVo {
+ /**Y-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /**Y-鏀粯璁㈠崟缂栧彿*/
+ private String payNo;
+ /**Y-閫�娆鹃噾椤嶏紝蹇呴』鍜屾敮浠橀噾棰濅竴鏍�*/
+ private BigDecimal refundTotal;
+ /**Y-鎿嶄綔鍛樺伐*/
+ private String employeeId;
+ /**N-閫�娆惧娉�*/
+ private String remark;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
deleted file mode 100644
index b939104..0000000
--- a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hz.his.vo.payment;
-
-import lombok.Data;
-
-/**
- * @author CJH
- */
-@Data
-public class PayNoVo {
-
- /**Y-璁㈠崟鍙�*/
- private String orderNo;
- /**Y-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛屾病鏈夌壒娈婅姹傞兘鏄粯璁�6*/
- private Integer lengrhCount = 6;
- /**Y-浜ゆ槗鏂瑰紡*/
- private String payWay;
- /**Y-璋冭捣鏀粯鐢ㄦ埛*/
- private String userId;
- /**Y-鍏宠仈绫诲瀷*/
- private Integer type;
- /**Y-鍏宠仈绫诲瀷鏍囪瘑*/
- private String typeId;
-
- /**N-鏀粯鏂瑰紡缂栧彿锛圥aymentMethod閲岄潰鐨勭紪鍙凤級锛屽叧鑱旇鍗曠殑鏀粯鏂瑰紡璁板綍*/
- private String paymentNo;
-
- /**鍏宠仈绫诲瀷-鎬昏鍗�*/
- public static final int TYPE_ORDER = 0;
-
- /**浜ゆ槗鏂瑰紡-寰俊*/
- public static final String PAY_WAY_WECHAT = "WECHAT";
- /**浜ゆ槗鏂瑰紡-鏀粯瀹�*/
- public static final String PAY_WAY_ALIPAY = "ALIPAY";
- /**浜ゆ槗鏂瑰紡-閾惰仈*/
- public static final String PAY_WAY_UNIONPAY = "UNIONPAY";
- /**浜ゆ槗鏂瑰紡-鏁板瓧浜烘皯甯�*/
- public static final String PAY_WAYE_EC = "EC";
-}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java
new file mode 100644
index 0000000..ce01c5b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoResVo.java
@@ -0,0 +1,16 @@
+package com.hz.phis.vo.payment;
+
+import lombok.Data;
+
+/**鑾峰彇鏀粯缂栧彿杩斿洖
+ * @author CJH
+ */
+@Data
+public class PayNoResVo {
+
+ /**Y-鏀粯缂栧彿*/
+ private String payNo;
+ /**N-鍥炶皟鍦板潃锛屽钩鍙扮殑缁熶竴澶勭悊
+ * 濡傛灉鏈夌壒鍒殑澶勭悊锛屽彲浠ヤ笉浣跨敤璇ュ洖璋冩帴鍙�*/
+ private String notifyUrl;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
new file mode 100644
index 0000000..e283663
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
@@ -0,0 +1,44 @@
+package com.hz.phis.vo.payment;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class PayNoVo {
+
+ /**N-3-鍓嶇紑*/
+ private String prefix;
+ /**Y-20-璁㈠崟鍙�*/
+ private String orderNo;
+ /**Y-9-鍙犲姞闀垮害锛屽湪orderNo鍚庨潰娣诲姞闀垮害锛岄粯璁�6锛�
+ * 娌℃湁鐗规畩瑕佹眰閮芥槸榛樿6锛屾渶澶�12*/
+ private Integer lengrhCount = 6;
+ /**N-浜ゆ槗鏂瑰紡锛孭ayWay鑾峰彇*/
+ private String payWay;
+ /**Y-璋冭捣鏀粯鐢ㄦ埛*/
+ private String userId;
+ /**N-璋冭捣鏀粯鍛樺伐*/
+ private String employeeId;
+ /**Y-鍏宠仈绫诲瀷*/
+ private Integer type;
+ /**Y-鍏宠仈绫诲瀷鏍囪瘑*/
+ private String typeId;
+
+ /**N-鏀粯鏂瑰紡缂栧彿锛圥aymentMethod閲岄潰鐨勭紪鍙凤級锛屽叧鑱旇鍗曠殑鏀粯鏂瑰紡璁板綍*/
+ private String paymentNo;
+
+ /**Y-1-杩斿洖鍥炶皟閫氱煡绫诲瀷*/
+ private Integer notifyType = NOTIFY_TYPE_PAY;
+
+ /**鍏宠仈绫诲瀷-鎬昏鍗�*/
+ public static final int TYPE_ORDER = 1;
+
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-鏀粯鍥炶皟*/
+ public static final int NOTIFY_TYPE_PAY = 1;
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-POS鏈洪��娆惧洖璋�*/
+ public static final int NOTIFY_TYPE_POS_REFUND = 2;
+ /**杩斿洖鍥炶皟閫氱煡URL绫诲瀷-POS鏈洪��娆惧洖璋冿紝鏈粨璐︾殑閫�娆�*/
+ public static final int NOTIFY_TYPE_POS_REFUND_ALL = 3;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
new file mode 100644
index 0000000..1f7ef58
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
@@ -0,0 +1,21 @@
+package com.hz.phis.vo.payment.qr;
+
+import lombok.Data;
+
+/**
+ * 璁㈠崟浜岀淮鐮佺敵璇疯繑鍥�
+ * @author CJH
+ */
+@Data
+public class OrderQrPayResponeVo {
+
+ /**鍟嗘埛鍙�-Y-32锛堝晢鎴峰湪鎷涜瀹屾垚鍟嗘埛杩涗欢鍚庡垎閰嶇殑鎷涜鍟嗘埛鍙凤級*/
+ private String merId;
+ /**鍟嗘埛璁㈠崟鍙�-Y-32锛堝晢鎴风鐢熸垚锛岃姹傛璁㈠崟鍙峰湪鏁翠釜鍟嗘埛涓嬪敮涓�锛�*/
+ private String outOrderNo;
+ /**骞冲彴浜ゆ槗娴佹按鍙�-Y-32-娌抽┈杩斿洖*/
+ private String platTrxNo;
+ /**浜岀淮鐮佸唴瀹癸紝闇�瑕佸皢鏀瑰唴瀹圭敓鎴愪簩缁寸爜*/
+ private String qrCode;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
new file mode 100644
index 0000000..6b98361
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
@@ -0,0 +1,36 @@
+package com.hz.phis.vo.payment.qr;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**璁㈠崟浜岀淮鐮佹敮浠�
+ * @author CJH
+ */
+@Data
+public class OrderQrPayVo {
+
+ /**N-32-绗笁鏂瑰晢鎴峰彿锛屾病鏈夋寚瀹氬彲涓嶄紶*/
+ private String merId;
+ /**鍟嗘埛璁㈠崟鍙�-Y-32锛堝晢鎴风鐢熸垚锛岃姹傛璁㈠崟鍙峰湪鏁翠釜鍟嗘埛涓嬪敮涓�锛�*/
+ private String outOrderNo;
+ /**N-浜ゆ槗鏂瑰紡锛孭ayWay鑾峰彇锛屼笉濉粯璁�*/
+ private String payWay;
+ /**Y-浜ゆ槗閲戦*/
+ private BigDecimal payTotal;
+ /**N-256-浜ゆ槗閫氱煡鍦板潃锛屼笉濉粯璁ゅ湴鍧�*/
+ private String notifyUrl;
+ /**缁堢IP-Y-64锛堝繀椤讳紶姝ｇ‘鐨勭敤鎴风IP锛�*/
+ private String spbillCreateIp;
+ /**N-鍟嗘埛鑷畾涔夊瓧娈�*/
+ private String reqReserved;
+ /**鍟嗗搧鎻忚堪-Y-128锛堝晢鍝佹弿杩颁氦鏄撳瓧娈垫牸寮忔牴鎹笉鍚岀殑搴旂敤鍦烘櫙鎸夌収浠ヤ笅鏍煎紡锛�
+ APP鏀粯锛氶渶浼犲叆搴旂敤甯傚満涓婄殑APP鍚嶅瓧-瀹為檯鍟嗗搧鍚嶇О锛屽ぉ澶╃埍娑堥櫎-娓告垙鍏呭�硷紱
+ 鍏紬鍙锋敮浠橈細浼犲叆鍏紬鍙峰悕绉�-瀹為檯鍟嗗搧鍚嶇О锛屼緥濡傦細鑵捐褰㈣薄搴�- image-QQ鍏粩锛�
+ 灏忕▼搴忔敮浠橈細浼犲叆鍟嗗鍚嶇О-閿�鍞晢鍝佺被鐩紝濡傦細鑵捐-娓告垙锛涖�傦級*/
+ private String body;
+
+ /**N-鏀粯鏂瑰紡缂栧彿锛圥aymentMethod閲岄潰鐨勭紪鍙凤級锛屾殏鏃剁敤涓嶄笂锛屽叧鑱旇鍗曠殑鏀粯鏂瑰紡璁板綍*/
+ private String paymentNo;
+
+}
diff --git a/pom.xml b/pom.xml
index da40af0..e9d5ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
<modules>
<module>phis-feign</module>
+ <module>phis-download-feign</module>
<!--涓嶉渶瑕佸垯娉ㄩ噴鍐嶆墦鍖�-->
<!--<module>../p-his-parent</module>-->
</modules>
@@ -33,7 +34,6 @@
<sfjson.version>2.4</sfjson.version>
<orgApache.commons>3.9</orgApache.commons>
<commons-io>2.6</commons-io>
- <orgApache.poi>3.9</orgApache.poi>
<net.sourceforge>2.6.12</net.sourceforge>
<pinyin4j>2.5.1</pinyin4j>
<commons.lang.version>2.5</commons.lang.version>
@@ -283,13 +283,6 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${jdk15on.version}</version>
- </dependency>
-
- <!-- excel2003浣跨敤鐨刯ar -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${orgApache.poi}</version>
</dependency>
<dependency>
--
Gitblit v1.8.0