From ee1d8e5a751a7b73cf5206c7b91ff6cc19b20d38 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期四, 08 十二月 2022 18:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-zhangxu
---
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java | 19 ++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java | 15 +++
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 8 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 21 +++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 +
phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java | 20 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 8 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java | 22 +++++
phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java | 20 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 26 ++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 20 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 3
13 files changed, 193 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java
new file mode 100644
index 0000000..df546c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * @Author
+ */
+@Data
+public class OrderCouponRefunDto {
+
+ /** 璁㈠崟浣跨敤浼樻儬鍗穒d */
+ private String orderCouponId;
+ /** 浼樻儬鏍囬 */
+ private String orderCouponTitle;
+}
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 f3d7783..993e363 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
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author wzh
@@ -13,6 +14,10 @@
/** 瀛愯鍗昳d */
private String orderItemId;
+ /** 瀛愯鍗曠被鍨� */
+ private String type;
+ /** 鍟嗗搧鍚嶇О */
+ private String goodsName;
/** 瀹為��鏁� */
private Integer refundNum;
/** 瀹為��閲戦 */
@@ -20,4 +25,7 @@
/** 瀹為��鍘熷洜 */
private String refundReason;
+ /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
+ private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+
}
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
new file mode 100644
index 0000000..400e7dd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -0,0 +1,26 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author
+ * 璁㈠崟缁撹处鎵╁睍 浜岀骇瀛愯鍗�
+ */
+@Data
+public class OrderItemSourceRefundDto {
+
+ /** 瀛愯鍗昳d */
+ private String orderItemSonId;
+ /** 瀛愯鍗曠被鍨� */
+ private String type;
+ /** 鍟嗗搧鍚嶇О */
+ private String goodsName;
+ /** 瀹為��鏁� */
+ private Integer refundNum;
+ /** 瀹為��閲戦 */
+ private BigDecimal refundMoney;
+ /** 瀹為��鍘熷洜 */
+ private String refundReason;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index b9f6f90..62000aa 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
@@ -16,6 +16,10 @@
/** 瀹為��閲戦 */
private BigDecimal money;
+ /** 澶囨敞 */
+ private String remarks;
+
+
public OrderPayMethodDto() {
}
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 9d9e63b..e80517e 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
@@ -30,4 +30,24 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
+
+ /** 閫�娆句俊鎭泦鍚� 蹇呭～ */
+ private List<OrderCouponRefunDto> couponList;
+ /** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
+ private String roleId;
+ /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isApproval;
+
+ /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isRefund;
+
+ /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
+ private Integer platformSource;
+
+ /**his鍔╂墜*/
+ public static Integer HIS_ASSISTANT = 0;
+
+ /**his鍚庡彴*/
+ public static Integer HIS_BACKSTAGE = 1;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
index e89eb6f..518d20f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -169,6 +169,9 @@
/** 搴峰崥浣虫爣璇�(KoapOrderTotal) */
private String koapOrderId;
+ /**璁㈠崟鎬婚噾棰濈殑鎶樺悗閲戦*/
+ private BigDecimal disTotal;
+
private OrderInfoDto orderInfo;
private List<String> activityIds;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
new file mode 100644
index 0000000..3609e6b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.treat;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛鍏宠仈鍛樺伐
+ * */
+@Data
+public class TreatAfterEmployeeDto {
+ /**浜哄憳绫诲瀷,涓嶄紶榛樿鍖荤敓绫诲瀷*/
+ private Integer type;
+ /**浜哄憳鏍囪瘑(鍛樺伐鏍囪瘑)*/
+ private String commonId;
+
+ /**浜哄憳绫诲瀷-鍖荤敓*/
+ public static final Integer TYPE_DOCTOR = 0;
+ /**浜哄憳绫诲瀷-鎶ゅ＋*/
+ public static final Integer TYPE_NURSE = 1;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
new file mode 100644
index 0000000..a19e73d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.treat;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛鍏宠仈椤圭洰
+ * */
+@Data
+public class TreatAfterProjectDto {
+ /**椤圭洰鍏宠仈绫诲瀷,涓嶄紶榛樿椤圭洰sku*/
+ private Integer type;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+
+ /**绫诲瀷-椤圭洰SKU*/
+ public static final Integer TYPE_SKU = 0;
+ /**绫诲瀷-椤圭洰SPU*/
+ public static final Integer TYPE_SPU = 1;
+ /**绫诲瀷-椤圭洰鎵�灞炴湯绾у垎绫�*/
+ public static final Integer TYPE_TYPE = 2;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
new file mode 100644
index 0000000..7f90e80
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.treat;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ * 鏈悗瑙嗛
+ * */
+@Data
+public class TreatAfterVideoDto extends PageDto {
+ /*******************2022-11-17:鏉′欢鏆傛椂鏄苟涓旂殑鍏崇郴***************************/
+ /**浜哄憳鏉′欢闆嗗悎*/
+ private List<TreatAfterEmployeeDto> employeeDtoList;
+ /**椤圭洰鏉′欢闆嗗悎*/
+ private List<TreatAfterProjectDto> projectDtoList;
+}
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 b1a7605..c374225 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
@@ -251,5 +251,13 @@
/*鍚屾棰嗗缓鐨勫弬鏁�*/
private boolean internal;
+ //淇敼鎿嶄綔浜哄悕绉�
+ private String opMan;
+
+ //淇敼鎿嶄綔浜烘爣璇�
+ private String opId;
+
+ //淇敼鎿嶄綔鐨勫娉�
+ private String note;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index f638802..fa0720e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -262,4 +262,11 @@
@PostMapping(value = "/user/project/items")
Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto);
+ /**
+ * 鑾峰彇鍒扮敤鎴疯鎯�(鍚屾浣跨敤)
+ * @param userId 鐢ㄦ埛鏍囪瘑
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/info/baseInfo")
+ Result userInfoBaseInfo(@RequestParam("userId") String userId);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java
new file mode 100644
index 0000000..e1206fd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/STreatService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.phisAdmin;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.treat.TreatAfterVideoDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 鏈悗瑙嗛
+ */
+@FeignClient(name="phis-service",contextId = "phis-treat-after-video")
+public interface STreatService {
+ /**
+ * 鏈悗瑙嗛鏌ヨ鎺ュ彛
+ */
+ @RequestMapping("/foreign/treat/after/video/list")
+ Result treatAfterVideoList(@RequestBody TreatAfterVideoDto treatAfterVideoDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index d712705..8428468 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -110,4 +110,25 @@
@PostMapping(value = "/audit/order/cancel")
Result cancelApproval(@RequestBody AduitDto aduitDto);
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗�
+ * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+ */
+ @PostMapping(value = "/order/create")
+ Result orderCreate(@RequestBody OrderPHisDto dto);
+
+ /**
+ * 寮�鏀惧钩鍙�-缁撹处
+ */
+ @PostMapping(value = "/order/payMoney")
+ Result orderPayMoney(@RequestBody PayDto dto);
+
+
+ /**
+ * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/partial/refund")
+ Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0