From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 2
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 10 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 19 ++
phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java | 5
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 12 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 8
phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java | 26 ++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java | 20 ++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 5
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 7
phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java | 33 +++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 20 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 10 +
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java | 25 ++
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 3
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 2
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 4
phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java | 46 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 8
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 12 +
phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java | 25 ++
phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java | 2
phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java | 56 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java | 10 +
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java | 13 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 18 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java | 6
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 20 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java | 37 ++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 10 +
37 files changed, 516 insertions(+), 13 deletions(-)
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
index 97d3bfb..8bbd680 100644
--- 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
@@ -159,6 +159,10 @@
//瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔
private String followUpWorks;
+
+ /***瀵煎尰鐢ㄦ埛娌荤枟灞忔搷浣滄椂 鏌ヨ鍜ㄨ璁板綍闇�瑕佽緭鍏ユ牎楠屽瘑鐮� 鐢ㄦ埛ciq鍚庡洓浣�**/
+ private String checkPassword;
+
public ConsultRecordDto() {
}
@@ -626,4 +630,12 @@
public void setFollowUpWorks(String followUpWorks) {
this.followUpWorks = followUpWorks;
}
+
+ public String getCheckPassword() {
+ return checkPassword;
+ }
+
+ public void setCheckPassword(String checkPassword) {
+ this.checkPassword = checkPassword;
+ }
}
\ No newline at end of file
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 734e310..4c0a590 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
@@ -26,7 +26,7 @@
private String searchData;
/**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
private List<String> payMethodList;
- /**浼樻儬鍒稿钩鍙�*/
+ /**浼樻儬鍒稿钩鍙�:crm;p-his*/
private String platform;
/** 璁㈠崟鏍囪瘑List */
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 6647a22..e251019 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
@@ -16,6 +16,9 @@
// 鍒掓墸璁板綍id
private String deductionSingleId;
+ /**鍒涘缓鏉ユ簮 0甯歌1鑷姩鐢熸垚锛堢郴缁熻嚜鍔紝鍙備笌鍥炶鎴栬�呭叾浠栵級*/
+ private Integer createType = 0;
+
// 鐢ㄦ埛椤圭洰id
private String userProjectId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
new file mode 100644
index 0000000..ee40c09
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 娉曞ぇ澶х缃蹭汉娴嬪弬涓庝汉
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddActorDto {
+
+ /** 鍙備笌浜虹被鍨� */
+ private String actorType;
+
+ /** 瀹氫綅X杞翠綅缃� */
+ private String positionX;
+ /** 瀹氫綅Y杞翠綅缃� */
+ private String positionY;
+ /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
+ private int positionPageNo = 1;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
index fdf078c..79b5aee 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @USER: fhx
* @DATE: 2024/3/6
@@ -21,6 +23,8 @@
private String signTemplateId;
/** 绛剧讲浠诲姟妯℃澘鍚嶇О */
private String signTemplateName;
+ /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */
+ private String templateType;
/** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
@@ -45,10 +49,26 @@
/** 绛剧珷id */
private String sealId;
+ //浣滃簾绛剧讲鐢ㄥ埌
/** 瀹氫綅X杞翠綅缃� */
private String positionX;
/** 瀹氫綅Y杞翠綅缃� */
private String positionY;
/** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
private int positionPageNo = 1;
+ /** 绛惧悕瀹藉害 */
+ private Integer width;
+ /** 绛惧悕楂樺害 */
+ private Integer height;
+
+ //鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
+ /** 鍙備笌浜虹被鍨�(FddActorConstants) */
+ private String actorType;
+ /** 鍙備笌浜鸿瘉浠剁被鍨� */
+ private String certType;
+
+// /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+// private String actorListStr;
+// /** 绛剧讲鍙備笌浜� */
+// private List<FddActorDto> actorList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
index dac1e47..3e7e4d3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
@@ -17,4 +17,6 @@
private String payMethodName;
/**鏀粯鏂瑰紡鐨勯��娆鹃噾棰�*/
private BigDecimal refundMoney;
+ /**鏀粯鏂瑰紡鐨勯��娆炬姷鎵ｅ��*/
+ private BigDecimal refundDeductionTotal;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java
new file mode 100644
index 0000000..219e3d5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroDataDto.java
@@ -0,0 +1,46 @@
+package com.hz.his.dto.micro;
+
+import lombok.Data;
+
+/**
+ * 棰滃�艰鍒掓暟鎹�
+ **/
+@Data
+public class MicroDataDto {
+ /**鍒嗙被鍚�:鐧藉厜/缇�/绱�/濉�*/
+ private String typeName;
+ /**閫傚簲鐥囦竴绾у垎绫�*/
+ private String firstTypeId;
+ /**閫傚簲鐥囦竴绾у垎绫诲悕*/
+ private String firstTypeName;
+ /**閫傚簲鐥囦簩绾у垎绫�*/
+ private String secondTypeId;
+ /**閫傚簲鐥囦簩绾у垎绫诲悕*/
+ private String secondTypeName;
+ /**閫傚簲鐥囦笁绾у垎绫�*/
+ private String thirdTypeId;
+ /**閫傚簲鐥囦笁绾у垎绫诲悕*/
+ private String thirdTypeName;
+ /**閫傚簲鐥�*/
+ private String indicationId;
+ /**閫傚簲鐥囧悕*/
+ private String indicationName;
+ /**绋嬪害绫诲瀷鏍囪瘑*/
+ private String degreeTypeId;
+ /**绋嬪害鍚�*/
+ private String degreeTypeName;
+ /**韬綋閮ㄤ綅鏍囪瘑*/
+ private String bodyPartId;
+ /**韬綋閮ㄤ綅鍚�*/
+ private String bodyPartName;
+ /**韬綋閮ㄤ綅瀛愰」鏍囪瘑*/
+ private String bodyPartItemId;
+ /**韬綋閮ㄤ綅瀛愰」鍚�*/
+ private String bodyPartItemName;
+ /**鏈�鍚庝竴绾ф暟鎹悕绉�*/
+ private String dataName;
+ /**鏈�鍚庝竴绾ф暟鎹爣璇�*/
+ private String dataId;
+ /**寰暣璁板綍鏍囪瘑*/
+ private String microRecordId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
index 55a0080..0c26f6f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroPlanDto.java
@@ -18,7 +18,10 @@
private String recommend;
/** 鎺掑簭鍙�(鍓嶇鎺掑簭) */
private Integer sortNum;
-
+ /**鍒嗙被瀛楃涓�*/
+ private String typeJson;
+ /**鎺ㄨ崘椤圭洰*/
private List<MicroPlanItemDto> itemList;
+ /**閫傚簲鐥�*/
private List<MicroPlanIndicationDto> indicationList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 8254f31..dedcdc1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -35,6 +35,16 @@
private String visitOrderId;
/** 鏄惁鑽夌*/
private Integer isDraft;
-
+ /**寤鸿淇℃伅*/
private List<MicroPlanDto> planList;
+ /**棰滃�艰鍒掍俊鎭�*/
+ private List<MicroDataDto> dataList;
+ /**鏌ヨ鏍囪瘑绫诲瀷:TreatPlan.typeStr*/
+ private String typeStr;
+ /**鏌ヨ涓�绾ф爣璇�*/
+ private String firstId;
+ /**鏌ヨ浜岀骇鏍囪瘑*/
+ private String secondId;
+ /**鍏宠仈澶氱骇鏍囪瘑*/
+ private List<MicroRecordIdDto> idList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java
new file mode 100644
index 0000000..2798eda
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordIdDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.micro;
+
+import lombok.Data;
+
+/**
+ * 瀛愮骇鏍囪瘑
+ **/
+@Data
+public class MicroRecordIdDto{
+ /***/
+ private String firstId;
+ private String secondId;
+
+}
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 28f4219..cef0e81 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -24,6 +24,12 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
+ /**鎶垫墸鐜伴噾閲戦*/
+ private BigDecimal cash = BigDecimal.ZERO;
+ /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
+ private BigDecimal integralCash = BigDecimal.ZERO;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
/**蹇呭～ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭～*/
@@ -31,6 +37,8 @@
/**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
private String commonItemId;
+ /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+ private String commonItemGoodsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
private String bodyPartsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
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 0fc384b..d74177a 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
@@ -23,6 +23,9 @@
private Integer refundNum;
/** 瀹為��閲戦 锛堝鎴峰～鍐欙級*/
private BigDecimal refundMoney;
+ /** 瀹為��鎶垫墸鍊�(绉垎锛屽墠绔牴鎹～鍐欑殑瀹為��閲戦(鎶垫墸閲戦)濉啓鎹㈢畻) */
+ private BigDecimal refundDeductTotal;
+
/** 閫�娆惧師鍥狅紙鍛樺伐锛� */
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
@@ -38,10 +41,21 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇ幇閲戦噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;
+
+
+
/**鍒嗛厤鍙��閲戦*/
private List<OrderPayMethodDto> refundPayMethodList;
/** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
private BigDecimal averageIntegral = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇ幇閲戯紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductAmount = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductIntegral = 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 ed46ddd..0a6dd75 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
@@ -35,10 +35,20 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇ幇閲戦噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;
+
+
/**鍒嗛厤鍙��閲戦*/
private List<OrderPayMethodDto> refundPayMethodList;
/** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/
private BigDecimal averageIntegral = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇ幇閲戯紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductAmount = BigDecimal.ZERO;
+ /** 骞虫憡鐨勬姷鎵ｇН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻锛�*/
+ private BigDecimal averageDeductIntegral = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index a03f7ad..7dbb7a3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -22,12 +22,19 @@
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
private Integer isExecute;
+ /** 鎶垫墸绫诲瀷 */
+ private String deductionType;
+ /** 鎶垫墸閫�娆炬�诲��(绉垎) */
+ private BigDecimal refundDeductionTotal;
+
/** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
private String refundNumberNo;
/** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
private String refundNumberName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal money;
+ /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/
+ private BigDecimal deductionTotal;
/** 澶囨敞 */
private String remarks;
@@ -36,11 +43,22 @@
public OrderPayMethodDto() {
}
- public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
+// public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
+// this.payMethodNo = payMethodNo;
+// this.payMethodName = payMethodName;
+// this.payTotal = payTotal;
+// this.isMoneyPay = isMoneyPay;
+// this.isExecute = isExecute;
+// }
+
+ public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal
+ , Integer isMoneyPay, Integer isExecute, String deductionType, BigDecimal refundDeductionTotal) {
this.payMethodNo = payMethodNo;
this.payMethodName = payMethodName;
this.payTotal = payTotal;
this.isMoneyPay = isMoneyPay;
this.isExecute = isExecute;
+ this.deductionType = deductionType;
+ this.refundDeductionTotal = refundDeductionTotal;
}
}
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 5d358a5..196d775 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
@@ -48,6 +48,16 @@
private BigDecimal refundTotal;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundIntegral;
+
+ /** 鍙��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalDeductAmount;
+ /** 鍙��娆炬姷鎵ｇ幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalDeductIntegral;
+ /** 濉啓鐨勯��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundDeductAmount;
+ /** 濉啓鐨勯��娆炬姷鎵ｇ幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundDeductIntegral;
+
/** 鍙��娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> payMethodList;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
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 d34e59f..db7eaf3 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
@@ -14,6 +14,8 @@
//鏀粯鎬婚噾棰� 蹇呭～
private BigDecimal paymentTotal;
+ //鏀粯鎶垫墸閲戦 蹇呭～
+ private BigDecimal paymentDeductionTotal;
// 鏀粯鏂瑰紡缂栧彿 蹇呭～
private String paymentNumberNo;
//鏀粯鏂瑰紡鍚嶇О 蹇呭～
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 3594f19..50a7ae6 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
@@ -22,9 +22,9 @@
/**浣跨敤浼犲�肩殑骞冲彴鏉ユ簮:0鍚�1鏄紝榛樿鍚�*/
private Integer usedTransmitApp = 0;
- /**蹇呭～ 骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+ /**骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭～ */
private String appId;
- /**蹇呭～ 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) */
+ /**鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭～ */
private String appIdCode;
/*蹇呭～ 閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨
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 57030f2..99fbe70 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
@@ -17,6 +17,8 @@
private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
+ /**蹇呭～ 鎶垫墸瀹為檯鏀粯鐨勯噾棰� 濡傛灉鏄Н鍒嗘姷鎵ｇ幇閲戣繖閲屽瓨鐨勬槸瑕佹敮浠樼殑绉垎*/
+ private BigDecimal deductionAmount = BigDecimal.ZERO;
/**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
private String commonId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index b17c67c..81e9e45 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -69,5 +69,7 @@
private String giveIncreaseTitle;
/**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseInfo;
+ /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+ private List<String> canIntegralCashIdList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
index 12dc6c9..eee977b 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
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @author fwq
* 椤圭洰鎵╁睍
@@ -11,7 +13,10 @@
public class ProjectDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
-
+ /**sku鏍囪瘑*/
+ private List<String> skuIdList;
+ /**骞冲彴appId*/
+ private String appId;
/**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
private String minPrice;
private String maxPrice;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
new file mode 100644
index 0000000..ba36af5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.report.user;
+
+import com.hz.his.dto.report.UserDetailReportDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛鎶ヨ〃鏌ヨ瀹㈡埛淇℃伅
+ * @author fwq
+ * */
+@Data
+public class UserDetailSelectDto extends UserDetailReportDto {
+ /**鏌ヨ娲昏穬鑰乂IP鎯呭喌 鍕鹃�変汉鏁帮細鏌ヨ�佹椿璺冿紝鍕鹃�夋祦澶憋細娴佸け 鍕鹃�夋椿璺�/娌夌潯 鏌ョ姸鎬�*/
+
+ /**鏌ヨ瀹㈡埛绛夌骇*/
+ private List<String> userLevelList;
+ /**涓夊ぇ椤圭洰鏈墽琛� 闆嗗悎 锛堟瘡涓兘鏄崟閫夛級*/
+
+ /**棰滃�艰鍒�(涓�绾э紝浜岀骇锛屼笁绾х殑闆嗗悎)*/
+
+ /**RFM 闆嗗悎 R1..R2..绛夐兘鏄崟閫�*/
+
+ /**瀹㈢兢:绛夌骇鍗曢�夛紝瑙﹁揪鍗曢��*/
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
index e0866b0..7c2d9e2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
@@ -42,6 +42,8 @@
private List<UserPretriageProjectDto> pretriageProjectList;
//鏍囩list
private List<UserPretriageLabelDto>pretriageLabelList;
+ //鍒濊瘖鍗℃爣绛緇ist
+ private List<UserPretriageLabelDto> firstVisitLabelList;
//棰勭害鍗旾D
private String appointmentId;
@@ -216,4 +218,12 @@
public void setLabelIds(List<String> labelIds) {
this.labelIds = labelIds;
}
+
+ public List<UserPretriageLabelDto> getFirstVisitLabelList() {
+ return firstVisitLabelList;
+ }
+
+ public void setFirstVisitLabelList(List<UserPretriageLabelDto> firstVisitLabelList) {
+ this.firstVisitLabelList = firstVisitLabelList;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
index a15203e..27e25c4 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
@@ -4,6 +4,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛绉戝鍏崇郴杞崲浣跨敤
@@ -15,6 +16,8 @@
private Integer type;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
/**鐐硅瘖鏃堕棿寮�濮�*/
private Date startTime;
/**鐐硅瘖鏃堕棿缁撴潫*/
@@ -25,6 +28,16 @@
private String operatorRemark;
/**绉戝鍏崇郴Json*/
private List<UserDoctorRoomItemDto> roomList;
+ /**
+ * 绉戝鍏崇郴瀛樺偍绫诲瀷:
+ * 0鎸夋�荤殑鍏崇郴瀛樺偍鎴愪竴鏉＄偣璇�
+ * 1鎸夊尰鐢熷垎寮�瀛樺偍鎴愪袱鏉＄偣璇�
+ * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉慉鍖荤敓->鐐硅瘖C鍖荤敓 瀛樺偍涓�鏉�
+ * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉態鍖荤敓->鐐硅瘖C鍖荤敓 瀛樺偍涓ゆ潯
+ * */
+ private Integer roomType = 0 ;
+ /**鍖荤敓鏍囪瘑,鍏宠仈鏍囪瘑*/
+ private Map<String,String> roomTypeMap;
/**鎿嶄綔浜轰俊鎭�*/
private String opId;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
new file mode 100644
index 0000000..e815426
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-doctor")
+public interface MDoctorService {
+
+ /**
+ * 鐐硅瘖鍖荤敓鎺ュ彛
+ */
+ @PostMapping(value = "/doctor/apply/diagnosis/add")
+ Result diagnosisAdd(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index c640347..fab86ce 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
@@ -106,6 +106,9 @@
* @return
*/
@PostMapping(value = "/project/list/by/type")
- Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+ Result getProjectByTypeId(@RequestBody ProjectDto projectDto);
+ /**鏌ヨ椤圭洰绉垎鎶垫墸鐜伴噾鐨勬瘮渚�*/
+ @PostMapping(value = "/project/integral/cash/rate")
+ Result getIntegralCashRate(@RequestBody ProjectDto projectDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
index 9f9e2a8..7ce47cd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -46,8 +46,45 @@
@PostMapping(value = "/micro/record/crm/see")
Result crmSee(@RequestBody MicroRecordDto dto);
+ /** crm鏌ョ湅璁板綍璇︽儏 - 棰滃�艰鍒�4.0鐗堟湰*/
+ @PostMapping(value = "/micro/record/crm/see/V2")
+ Result crmSeeV2(@RequestBody MicroRecordDto dto);
+
+ /** his鍔╂墜鏌ョ湅璁板綍璇︽儏 - 棰滃�艰鍒�4.0鐗堟湰*/
+ @PostMapping(value = "/micro/record/his/see/V2")
+ Result hisSeeV2(@RequestBody MicroRecordDto dto);
+
/** 鏍规嵁鐢ㄦ埛id鏌ヨ鏄惁鏈夋湭鏌ョ湅杩囩殑寰暣璁板綍 */
@PostMapping(value = "/micro/record/check/view")
Result checkView(@RequestBody MicroRecordDto dto);
+ //--------------------棰滃�艰鍒�4.0------------------------------
+ /** 寰暣璁板綍鍒楄〃 */
+ @PostMapping(value = "/micro/record/list/V2")
+ Result listV2(@RequestBody MicroRecordDto dto);
+
+ /** 璁板綍璇︽儏 */
+ @PostMapping(value = "/micro/record/details/V2")
+ Result detailsV2(@RequestBody MicroRecordDto dto);
+
+ /** 閫傚簲鐥囨暟鎹� */
+ @PostMapping(value = "/micro/record/indication/data/V2")
+ Result indicationDataV2(@RequestBody MicroRecordDto dto);
+
+ /** 閫傚簲鐥囨不鐤楀缓璁� */
+ @PostMapping(value = "/micro/record/treatPlan/V2")
+ Result treatPlanV2(@RequestBody MicroRecordDto dto);
+
+ /** 鏂板寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/add/V2")
+ Result addV2(@RequestBody MicroRecordDto dto);
+
+ /** 淇敼寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/edit/V2")
+ Result editV2(@RequestBody MicroRecordDto dto);
+
+ /** 鍒犻櫎寰暣璁板綍 */
+ @PostMapping(value = "/micro/record/del/V2")
+ Result delV2(@RequestBody MicroRecordDto dto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 549acc7..fa030f6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarCommonReturnDto;
import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -136,6 +137,18 @@
Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
/**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖瀹℃牳鍥炶皟
+ */
+ @PostMapping(value = "user/room/doctor/diagnosis")
+ Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖褰撴湀閫氳繃娆℃暟
+ */
+ @PostMapping(value = "user/room/doctor/diagnosis/count")
+ Result diagnosisFamiliesRoomCount(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+ /**
* 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
*/
@PostMapping(value = "/user/common/approve/create")
@@ -146,4 +159,10 @@
*/
@PostMapping(value = "/user/arrive/edit")
Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍛樺伐鑾峰彇鑾峰彇鐭俊鍐呭閾炬帴
+ */
+ @PostMapping(value = "/user/acquisition/get/link")
+ Result getUserAcquisitionLink(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
index 30a3ff8..7a314d6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.AppointmentVisitVo;
+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;
@@ -57,6 +58,11 @@
@PostMapping("/admin/group/report/zs/doctor/list")
Result deductionZsDoctorList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 澧為暱閮�-鍖荤敓绉佸煙缇ゆ暟鎹�-娓楅�忎笟缁�-瀵煎嚭
+ */
+ @PostMapping("/admin/group/report/zs/doctor/list/export")
+ Result deductionZsDoctorListExport(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍖荤敓鎵ц涓氱哗鏁版嵁-鍚湇鍔￠棬搴楁寚鏍�
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
index 99fb1fe..df278bc 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -36,9 +36,21 @@
@RequestMapping(value="/fdd/sign/task/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
- /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
- @RequestMapping("/fdd/sign/task/cancelSignTask")
- Result cancelSignTask(@RequestBody FddDto dto);
+ /** 鏂板鏂囨。绛剧讲浠诲姟鍙備笌浜� */
+ @RequestMapping("/fdd/sign/task/addDocSignTaskActor")
+ Result addDocSignTaskActor(@RequestBody FddDto dto);
+
+ /** 鎾ら攢绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/cancel")
+ Result cancel(@RequestBody FddDto dto);
+
+ /** 浣滃簾绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/abolish")
+ Result abolish(@RequestBody FddDto dto);
+
+ /** 瀹屾垚绛剧讲浠诲姟 */
+ @RequestMapping("/fdd/sign/task/finish")
+ Result finish(@RequestBody FddDto dto);
/** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
@PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java
new file mode 100644
index 0000000..6215a5a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.sync;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-st-user")
+public interface SyncSTUserImgService {
+
+
+ /*** 鍚屾鍟嗗搧鐢ㄦ埛澶村儚**/
+ @PostMapping(value = "/st/sync/getStImgUrl")
+ Result syncStUserImg(@RequestBody Map<String,Object> userMap);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
index ae63cc7..835b7f5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -7,8 +7,9 @@
*/
@Data
public class LabelFindVo {
-
- /**鑼冨洿鏍囪瘑*/
+ /**鑼冨洿鏍囪瘑-鏂�(鍥犱负鏃у瓧娈电殑澶勭悊鏌ヨ琚睆钄�)*/
+ private String rangeCodeNew;
+ /**鑼冨洿鏍囪瘑-鏃�*/
private String rangeCode;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
index 053da40..7bf4128 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -19,6 +19,8 @@
private String payMethodName;
/** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+ private BigDecimal payDeductionTotal;
/**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPay;
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
@@ -32,6 +34,8 @@
private String refundMethodName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal refundTotal;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰�-鎶垫墸閲戦锛�*/
+ private BigDecimal refundDeductionTotal;
/**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPayRefund;
/**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
index bcdaa7e..2cbadab 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
@@ -23,9 +23,17 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙�� 鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /** 鍙��绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
/**鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
index c079fca..4d85381 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
@@ -24,10 +24,20 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/** 鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /** 鍙��鎬绘姷鎵ｇ幇閲戠殑绉垎*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒嗘姷鎵ｇ殑鐜伴噾*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
+
+
/**鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyIntegralDeduction = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎鎶垫墸鐨勯噾棰�*/
+ private BigDecimal occupyIntegralCash = BigDecimal.ZERO;
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
index 5a96e24..28eb8ed 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -47,14 +47,28 @@
private BigDecimal approveRefundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-鍙��鎬荤Н鍒�*/
private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal approveIntegralCash = BigDecimal.ZERO;
+
/**绯荤粺璁＄畻璧嬪��-鍒嗛厤閲戦*/
private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎*/
private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤鎶垫墸鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎鎶垫墸鐨勭幇閲�*/
+ private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;
+
/**绯荤粺璁＄畻璧嬪��-閫�娆鹃噾棰�*/
private BigDecimal refundTotal = BigDecimal.ZERO;
/**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒�*/
private BigDecimal refundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆炬姷鎵ｇ殑鐜伴噾鐨勭Н鍒�*/
+ private BigDecimal refundIntegralDeduction = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒嗘姷鎵ｇ殑鐜伴噾*/
+ private BigDecimal refundIntegralCash = BigDecimal.ZERO;
/**鎿嶄綔绫诲瀷-绯荤粺*/
public static final String OP_TYPE_SYSTEM = "system";
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java
new file mode 100644
index 0000000..1f0e640
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/IntegralCashVo.java
@@ -0,0 +1,33 @@
+package com.hz.his.vo.project;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 绉垎鎶垫墸鐜伴噾閰嶇疆
+ */
+@Data
+public class IntegralCashVo {
+ /**绉垎鎶垫墸鐜伴噾鏀粯鏂瑰紡缂栧彿*/
+ private String payNo;
+ /**绉垎*/
+ private BigDecimal integral = BigDecimal.ZERO;
+ /**鐜伴噾*/
+ private BigDecimal cash = BigDecimal.ZERO;
+ /**榛樿姣斾緥*/
+ private BigDecimal rate = BigDecimal.ZERO;
+ /**鏄惁鍚敤*/
+ private Integer isUp;
+ /**鏄惁鍏ㄥ钩鍙板彲鐢�,濡傛灉杩欎釜鍊间负0,鍒欏彧鏈夐檺鍒跺钩鍙拌〃limit_common鐨勫钩鍙拌兘浣跨敤銆愮Н鍒嗘姷鎵ｇ幇閲戙�戞敮浠樻柟寮�*/
+ private Integer isAllPlatform;
+ /**鏄惁璁剧疆鍏ㄩ儴椤圭洰鎶垫墸,濡傛灉杩欎釜鍊间负0,榛樿鐨勬姷鎵ｆ瘮渚嬪氨鏄�0,濡傛灉鍊间负1,鍒欎娇鐢ㄨ缃殑榛樿姣斾緥*/
+ private Integer isNoLimit;
+ /**鏄惁鏈夐檺鍒堕」鐩�,濡傛灉杩欎釜鍊间负1,鍒欓檺鍒堕」鐩〃integral_cash_project鐨勯」鐩娇鐢ㄥ悇鑷缃殑姣斾緥*/
+ private Integer isHaveProjectLimit;
+
+ /**姣忎釜SKU鐨勬渶澶ф姷鎵ｆ瘮渚�*/
+ private Map<String,BigDecimal> skuMaxRateMap;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java b/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java
new file mode 100644
index 0000000..643f0a1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/project/SkuDeductionVo.java
@@ -0,0 +1,56 @@
+package com.hz.his.vo.project;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * SKU鎶垫墸鏁版嵁
+ */
+@Data
+public class SkuDeductionVo {
+ /**sku鏍囪瘑*/
+ private String skuId;
+ /**sku鏈�澶у彲鎶垫墸鐜伴噾閲戦*/
+ private BigDecimal maxCash = BigDecimal.ZERO;
+ /**sku鎶垫墸鏈�澶х幇閲戦噾棰濋渶瑕佹敮浠樼殑绉垎*/
+ private BigDecimal maxIntegralCash = BigDecimal.ZERO;
+
+ /**鎬诲崟璐拱椤圭洰鏁伴噺*/
+ private Integer totalBuyNum = 0;
+ /**椤圭洰鏁伴噺鍗犳�诲崟姣�*/
+ private BigDecimal skuNumRate = BigDecimal.ZERO;
+ /**瀛愬崟璐拱鏁伴噺*/
+ private Integer buyNum = 0;
+ /**瀛愬崟鐜颁环x鏁伴噺绠楀嚭鐨勬�婚噾棰�*/
+ private BigDecimal skuPrice = BigDecimal.ZERO;
+ /**瀛愬崟鍙姷鎵ｆ渶澶х幇閲戦噾棰�*/
+ private BigDecimal skuMaxCash = BigDecimal.ZERO;
+
+ /**鍓╀綑鍙垎閰�*/
+ private BigDecimal cash = BigDecimal.ZERO;
+
+ /**
+ * 璁＄畻鎶垫墸閲戦
+ * */
+ public void handlerMoney() {
+ //璁＄畻瀛愬崟鏈�澶у彲鎶垫墸
+ this.skuMaxCash = this.maxCash.multiply(new BigDecimal(this.buyNum));
+ //榛樿璧嬪�糲ash
+ handlerCash(BigDecimal.ZERO);
+ }
+
+ /**璁＄畻鏁伴噺*/
+ public void handlerNum(Integer totalBuyNum) {
+ this.totalBuyNum = totalBuyNum;
+ if (totalBuyNum != 0){
+ this.skuNumRate = new BigDecimal(this.buyNum).divide(new BigDecimal(this.totalBuyNum),2,RoundingMode.HALF_UP);
+ }
+ }
+
+ /**璁＄畻鏁伴噺*/
+ public void handlerCash(BigDecimal totalMoney) {
+ this.cash = this.skuMaxCash.subtract(totalMoney).setScale(2,RoundingMode.HALF_UP);
+ }
+}
--
Gitblit v1.8.0