From 2cd54a74f83835604df8f9774fe0f0172f514fac Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 10 十月 2023 19:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java | 13 +++++++++++--
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java | 3 +++
7 files changed, 27 insertions(+), 3 deletions(-)
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 d956e15..8297196 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
@@ -46,6 +46,8 @@
private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
+ /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundIntegral;
/** 鍙��娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> payMethodList;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
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 64e4d71..b6421b0 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
@@ -43,5 +43,7 @@
private Date startTime;
private Date endTime;
+ //鏄惁璇勪环
+ private Integer isEvaluate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
index fb04d0d..03ab138 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
@@ -16,7 +16,7 @@
private String fromCode;
/**
- * 鏉ユ簮鍚嶇О
+ * 鏉ユ簮鍚嶇О/鏉ユ簮璺緞
*/
private String fromName;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
index 5dd73ae..f4f6bd2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java
@@ -27,4 +27,7 @@
private String recordId;
/**鎿嶄綔绫诲瀷*/
private Integer opType;
+
+ //鏄惁杩囨护棰嗗缓鏁版嵁
+ private Integer isFilterate;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
index 04617ed..c2a06e9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java
@@ -27,4 +27,6 @@
private String recordId;
/**鎿嶄綔绫诲瀷*/
private Integer opType;
+ //鏄惁杩囨护棰嗗缓鏁版嵁
+ private Integer isFilterate;
}
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
index 345aff0..b815fe0 100644
--- 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
@@ -11,8 +11,8 @@
import java.math.BigDecimal;
/**
- * @ClassName SActivityController
- * @Description 娲诲姩瑙勫垯
+ * @ClassName SQuestionnaireService
+ * @Description 璋冩煡闂嵎鎺ㄩ�佽褰�
* @Author Wrh
* @Date 2022/8/8 17:36
* @Version 1.0
@@ -29,5 +29,14 @@
Result getSendingRecordsDetail(@RequestBody(required = false) UserDto dto);
+ /**
+ * 鑾峰彇璋冩煡闂嵎鎺ㄩ�佽褰曞垪琛�
+ * @param dto 鐢ㄦ埛鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/sending/records/list")
+ Result getSendingRecordsList(@RequestBody(required = false) UserDto 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 70b272f..ca639b0 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
@@ -108,4 +108,10 @@
*/
@PostMapping(value = "/user/gzh/info")
Result userGZHInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇crm灏忕▼搴忚烦杞摼鎺�
+ */
+ @PostMapping(value = "/user/crm/url/link")
+ Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0