From 09f35ed2fd2adb0ea412ac3bd707945bc35b6812 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 10:08:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java | 20 ++
phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java | 30 +++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java | 26 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java | 7
phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java | 25 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java | 30 +++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java | 10 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 10 +
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java | 24 ++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 3
phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java | 19 ++
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 137 +++++++++++++-
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 8
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java | 2
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 11 +
phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java | 44 ++++
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 7
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 9 +
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 29 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 31 +++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4
26 files changed, 490 insertions(+), 18 deletions(-)
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 3eab1ff..d9e6954 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
@@ -20,6 +20,8 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
private String id;
@@ -40,6 +42,8 @@
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
+
+
//寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
/** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
private String couponGoodsArr;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
index 8402cc6..d2c7327 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
@@ -11,8 +11,17 @@
/**浼樻儬鍒告爣璇�*/
private String couponId;
-
/**鏁伴噺*/
private Integer num;
+ //澶氫紭鎯犲埜鍙戞斁鏃朵娇鐢ㄥ瓧娈�
+ /**鎵规鍙峰悕绉�*/
+ private String recordName;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
+ /**鍏叡绫诲瀷(CouponRecordDto)*/
+ private String commonType;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index a76c56d..82af4b1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -16,6 +16,8 @@
private String recordName;
/**鍏叡鏍囪瘑*/
private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
@@ -35,4 +37,6 @@
public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
/**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+ /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+ public static final String TYPE_COMMON_ORDER = "order";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
new file mode 100644
index 0000000..8c33864
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
@@ -0,0 +1,44 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟鍙戞斁浼樻儬鍒竏to
+ * @USER: fhx
+ * @DATE: 2023/6/27
+ **/
+@Data
+public class OrderSendCouponDto {
+
+ /**鐢ㄦ埛淇℃伅*/
+ UserArrDto userArrDto;
+
+ /** 浼樻儬鍒镐俊鎭垪琛� */
+ private List<CouponItemDto> itemDtoList;
+
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+
+
+ //--------------------------------------------------------------------
+ //瀵瑰簲phis琛–ouponReleaseRecord甯搁噺
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OPERATOR_TYPE_ADMIN = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
+ public static Integer OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OPERATOR_TYPE_SYSTEM = 3;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛璁㈠崟璐拱*/
+ public static Integer OPERATOR_TYPE_USER_ORDER = 4;
+
+}
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 5d1e9d1..db77806 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
@@ -2,26 +2,139 @@
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
- * @ClassName DeductionDto
- * @Description 鍒掓墸
- * @Author Wrh
- * @Date 2022/10/13 10:37
- * @Version 1.0
+ * 鍒掓墸鎺ュ彈鍙傛暟 鍏堟敼鍚嶅悗缁簾寮�
+ * author:andru
+ * Date:2021/12/10 14:41
*/
@Data
public class DeductionDto {
- /**鍒掓墸id*/
+ // 鍒掓墸璁板綍id
private String deductionSingleId;
- /**鐢ㄦ埛id*/
- private String userId;
- /**鏄惁瀹㈡埛纭(0:鍚︼紝1:鏄�)*/
- private Integer isCustomerConfirm;
- /**娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d*/
+
+ // 鐢ㄦ埛椤圭洰id
+ private String userProjectId;
+
+ // 鐢ㄦ埛椤圭洰瀛愰」id(鍏蜂綋鍒掓墸鐨勯」鐩暟鎹殑id)
+ private String userProjectItemId;
+
+ // 鍏敤鏍囪瘑 (棰勭害璁㈠崟濉啓id)
+ private String commonId;
+
+ // 娌荤枟閫氱煡鍗昳d
+ private String treatSingleId;
+
+ // 娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d
private String treatProjectId;
- /**椤圭洰id鍒楄〃*/
+
+ // 鎺ヨ瘖鍜ㄨ甯坕d
+ private String receptionConsultantId;
+
+ // 鏂板绫诲瀷 DeductionSingleConstants.TYPE_SELF_ADD 榛樿鑷
+ private String type = "self_add";
+
+ // 绉戝id(FamiliesRoom)
+ private String departmentId;
+ // 绉戝缂栧彿
+ private String departmentCode;
+ // 绉戝鍚嶇О
+ private String departmentName;
+
+ // 涓昏瘖鍖荤敓鏍囪瘑(Employee)
+ private String primaryDoctorId;
+ // 涓昏瘖鍖荤敓鍚嶇О
+ private String primaryDoctorName;
+
+ // 娌荤枟鍖荤敓鏍囪瘑(Employee)
+ private String treatmentDoctorId;
+ // 娌荤枟鍖荤敓鍚嶇О
+ private String treatmentDoctorName;
+
+ // 澶囨敞淇℃伅
+ private String remarkInfo;
+
+ // 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴)
+ private String appId;
+
+ // 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～)
+ private String appIdCode;
+
+ // 鏉ユ簮浠ｇ爜锛堝簲鐢╝ppId锛�
+ private String sourceCode;
+
+ // 鏉ユ簮鍚嶇О
+ private String sourceName;
+
+ // 鏁伴噺/鍒掓墸娆℃暟
+ private Integer deductionNum = 0;
+
+ // 鎵ц寮�濮嬫椂闂�
+ private Date executeStartTime;
+
+ // 鎵ц缁撴潫鏃堕棿
+ private Date executeEndTime;
+
+ // 鍙備笌浜哄憳鏁版嵁 json
+ private String deductionJoinJson;
+
+ // 鍒掓墸椤圭洰娑堣�楀鏂�/鑽搧鏁版嵁 json
+ private String deductionDrugsJson;
+
+ // 鍒掓墸璁惧鍙傛暟鏁版嵁 json
+ private String deductionDeviceParameterJson;
+
+ // 瀹㈡埛绛惧悕鏁版嵁 json
+ private String deductionSignJson;
+
+ // 鍒掓墸韬綋閮ㄤ綅鏁版嵁 json
+ private String deductionBodyPartJson;
+
+ // 瀵规瘮鐓х墖璁板綍
+ private String comparePhotoRecordJson;
+
+ // 鎵归噺娣诲姞椤圭洰id鍒楄〃
+ private String userProjectIds;
+
+ // 闂ㄥ簵id
+ private String shopId;
+
+ // 鎿嶄綔浜哄憳宸d
+ private String operatorId;
+
+ // 鐢ㄦ埛id
+ private String userId;
+
+ // 鍒掓墸鏃ュ織寮�濮嬫椂闂�
+ private String logStartTime;
+
+ // 鍒掓墸鏃ュ織缁撴潫鏃堕棿
+ private String logEndTime;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織椤垫暟
+ private Integer page;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織鏉℃暟
+ private Integer size;
+
+ // 瀹㈡埛纭鐘舵��
+ private Integer isCustomerConfirm;
+
+ //閮ㄤ綅绫诲瀷锛圖eductionSingleConstants锛�
+ private Integer partType;
+ //璁㈠崟鍒嗙被锛圤rderTotalConstants锛�
+ private Integer orderClassify;
+
+ // 椤圭洰id鍒楄〃
private List<String> projectIds;
+
+ // phitab鍒掓墸鍒涘缓鏃堕棿
+ private Date phitabCreateTime;
+
+ public DeductionDto() {
+
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
new file mode 100644
index 0000000..8d3062e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.doctorTime;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @ClassName DoctorTimeDto
+ * @Description 鍖荤敓鎺掔彮dto
+ * @Author wrh
+ * @Date 2023/7/4 14:40
+ * @Version 1.0
+ */
+@Data
+public class DoctorTimeDto extends PageDto {
+
+ String monthStr;
+ String shopId;
+ String doctorId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
index 8c82c2f..4403155 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -12,4 +12,14 @@
/**妗跺悕绉�-鍙笉浼�*/
private String bucketName;
+ private String fileName;
+
+ private String method;
+
+ public FileSignVo() {
+ }
+
+ public FileSignVo(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
new file mode 100644
index 0000000..d58528a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.mp;
+
+
+/**
+ * 灏忕▼搴忎簩缁寸爜dto
+ */
+public class MpQrCodeDto {
+
+ //ciq
+ private String ciq;
+
+ //闂ㄥ簵缂栧彿
+ private String shopCode;
+
+ public String getCiq() {
+ return ciq;
+ }
+
+ public void setCiq(String ciq) {
+ this.ciq = ciq;
+ }
+
+ public String getShopCode() {
+ return shopCode;
+ }
+
+ public void setShopCode(String shopCode) {
+ this.shopCode = shopCode;
+ }
+}
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 caca455..2992a9f 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
@@ -20,6 +20,8 @@
private BigDecimal total;
/**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
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 bc5dfb3..a0a1f97 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
@@ -26,4 +26,8 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
+
}
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 3590a52..60a9bc3 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
@@ -65,6 +65,9 @@
/**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+ private BigDecimal totalPoints;
+
/**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
private OrderInfoDto orderInfo;
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 4e5fccc..a92147a 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
@@ -22,4 +22,12 @@
private String cardEquityId;
/**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
private String userCardId;
+
+ /**
+ * 鏍囪瀛楁锛岄粯璁�0
+ * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+ * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+ * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+ */
+ private Integer isDel = 0;
}
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 1164640..543ace4 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
@@ -48,7 +48,11 @@
/**绗笁鏂硅鍗曠紪鍙�*/
private String otherOrderNo;
-
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+
+ /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index d745c62..57fef07 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -35,4 +35,11 @@
*/
@PostMapping(value = "/consumables/update/list")
Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);
+
+ /**
+ * 鑾峰彇浼樻儬鍒稿晢鍝佸垪琛�
+ * @return Result
+ */
+ @PostMapping(value = "/consumables/coupon/list")
+ Result getConsumablesCouponList(@RequestBody PageDto pageDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
new file mode 100644
index 0000000..438240e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.doctorTime.DoctorTimeDto;
+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 = "doctorTime")
+public interface SDoctorTimeService {
+
+ /**
+ * 鑾峰彇鍖荤敓鎺掔彮鍒楄〃
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/list")
+ Result list(@RequestBody DoctorTimeDto dto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index b927907..5a4670b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -53,6 +53,14 @@
* @return 浣跨敤FileSignReturnVo杞寲
*/
@PostMapping(value = "/cos/signUrl")
- Response downloadFile(@RequestBody FileSignVo fileSignVo);
+ Result signUrl(@RequestBody FileSignVo fileSignVo);
+
+ /**
+ *鐢熸垚涓婁紶绛惧悕
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/policy")
+ Result policy(@RequestBody FileSignVo fileSignVo);
}
\ 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 c8e699a..9364e5f 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.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -55,4 +56,12 @@
*/
@PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/order/send/coupon")
+ Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+
}
\ No newline at end of file
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 a347d90..a3397c3 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
@@ -24,7 +24,6 @@
@PostMapping(value = "/deduction/customer/confirm/all")
Result customerConfirmAll(@RequestBody DeductionDto dto);
-
/**
* 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁
*/
@@ -32,8 +31,38 @@
Result customerConfirmBefore(@RequestBody DeductionDto dto);
/**
+ * 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁鎵�鏈夋湭纭鏁版嵁
+ */
+ @PostMapping(value = "/deduction/customer/confirm/all/before")
+ Result customerConfirmAllBefore(@RequestBody DeductionDto dto);
+
+ /**
* 鑾峰彇鐢ㄦ埛鍒掓墸淇℃伅涔嬪墠鐨勫尰鐢熶俊鎭�
*/
@PostMapping(value = "/deduction/project/before/doctor/info")
Result projectBeforeDoctorInfo(@RequestBody DeductionDto dto);
+
+ /**
+ * 鏂板鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/add")
+ Result addData(@RequestBody DeductionDto dto);
+
+ /**
+ * 淇敼鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/update")
+ Result updateData(@RequestBody DeductionDto dto);
+
+ /**
+ * 浣滃簾鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/rescinded")
+ Result rescindedData(@RequestBody DeductionDto dto);
+
+ /**
+ * 鍒犻櫎鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/delete")
+ Result deleteData(@RequestBody DeductionDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
new file mode 100644
index 0000000..8d6e743
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMpQrCodeService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.mp.MpQrCodeDto;
+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-qrcode")
+public interface SPhipMpQrCodeService {
+
+ /**
+ * 寮�鏀惧钩鍙�- 鐢ㄦ埛鎵爜鐧昏妯″潡 娉ㄥ唽缁戝畾鍚庡垱寤篽is鍔╂墜灏忕▼搴忕爜(MpQrCodeController-userTempVisitQrCode鏂规硶)
+ */
+ @PostMapping(value = "/mp/qrcode/user/temp/visit/qrcode")
+ Result userTempVisitQrCode(@RequestBody MpQrCodeDto mpQrCodeDto);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
index ba67f69..0fb33a9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserCardService.java
@@ -25,6 +25,12 @@
@PostMapping(value = "/user/card/delay/cardBag")
Result delayCardBag(@RequestBody CardBagDto cardBagDto);
+ /**
+ * 寮�鏀惧钩鍙�-鍗″寘鍙姷鎵ｄ俊鎭�
+ * @return 杞寲瀵硅薄UserCardVo
+ */
+ @PostMapping(value = "/user/card/get/deduction-data")
+ Result deductionData(@RequestBody CardBagDto cardBagDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
index 4761502..588e536 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
@@ -24,7 +24,7 @@
* 寮�鏀惧钩鍙�-纭鎻愪氦閫�娆�
* data 鏃犲疄浣撹浆鍖栫敤
*/
- @PostMapping(value = "/confirm")
+ @PostMapping(value = "/card/refund/confirm")
Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
new file mode 100644
index 0000000..1e05b0b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.cos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OssRecoverVO
+ * @Description cos鐢熸垚绛惧悕杩斿洖vo
+ * @Author wrh
+ * @Date 2023/6/30 17:30
+ * @Version 1.0
+ */
+@Data
+public class OssRecoverVO {
+
+ private String accessid;
+ //绛惧悕
+ private String signature;
+ private String dir;
+ private String host;
+ //杩囨湡鏃堕棿
+ private String expire;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java
new file mode 100644
index 0000000..ce3be1e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardEquityVo.java
@@ -0,0 +1,26 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鐢ㄦ埛鍗￠」鏉冪泭淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardEquityVo {
+
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鏍囪瘑*/
+ private String equityId;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鍚嶇О*/
+ private String equityName;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-绫诲瀷*/
+ private Integer equityType;
+ /**鐢ㄦ埛鍗￠」鏉冪泭-鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鏉′欢鍊�*/
+ private Integer conditionValue;
+ /**鍏宠仈鐨勬潯鐩�*/
+ private List<UserCardItemVo> userCardItemVoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
new file mode 100644
index 0000000..7f60784
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -0,0 +1,29 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鐢ㄦ埛鍗￠」鏉＄洰淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardItemVo {
+
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鏍囪瘑*/
+ private String itemId;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
+ private String itemName;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
+ private BigDecimal singleAmount;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鎬绘姷鎵ｆ鏁�*/
+ private Integer deductionNum;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸娆℃暟*/
+ private Integer deductionSingle;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-宸叉姷鎵ｆ鏁�*/
+ private Integer usedNum;
+ /**鍓╀綑鍙姷鎵ｆ�绘鏁�*/
+ private Integer surplusNum;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
new file mode 100644
index 0000000..ecdba91
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java
@@ -0,0 +1,24 @@
+package com.hz.his.vo.user.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鐢ㄦ埛鍗￠」淇℃伅
+ * @author CJH*/
+@Data
+public class UserCardVo {
+
+ /**鐢ㄦ埛鍗￠」-鏍囪瘑*/
+ private String userCardId;
+ /**鍗￠」-鏍囪瘑*/
+ private String cardId;
+ /**鍗￠」-鍚嶇О*/
+ private String cardName;
+ /**鍗￠」-鎬婚噾棰�*/
+ private BigDecimal total;
+ /**鍏宠仈鐨勬潈鐩�*/
+ private List<UserCardEquityVo> userCardEquityVoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
index b92d257..a08b8de 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
@@ -12,7 +12,7 @@
* */
@Data
public class GoodsDetailDt extends BaseDt {
- /**绫诲瀷(1鍟嗗搧2鑽搧)*/
+ /**绫诲瀷(1鍟嗗搧2鑽搧3浼樻儬鍒�)*/
private Integer type;
/**缂栧彿*/
private String serialNumber;
@@ -172,4 +172,9 @@
private String bigTypeCode;
/**鑽搧澶х被鍚�*/
private String bigTypeName;
+
+ //鍏宠仈鏍囪瘑(绫诲瀷涓�3鍒欏叧鑱斾紭鎯犲埜id)
+ public String commonId;
+ //鍏戞崲绉垎
+ private BigDecimal integral;
}
--
Gitblit v1.8.0