From ee12f2e9d0a8bbeab9627cbc79f04030365f06b7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 09 五月 2023 19:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-prod-new-优惠券校验
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 41 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java | 37 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 7 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 11 +-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java | 25 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java | 25 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 6 +
phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java | 27 ++++++
phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java | 33 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java | 7 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java | 21 +++++
11 files changed, 233 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
new file mode 100644
index 0000000..2f285f0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java
@@ -0,0 +1,37 @@
+package com.hz.his.dto.project;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProjectWarnRecordDto {
+
+ // 椤�
+ private Integer pageNum;
+ // 姣忛〉鏁伴噺
+ private Integer pageSize;
+ // 椤鹃棶id
+ private String employeeId;
+ // 鐢ㄦ埛id
+ private String userId;
+ // 鍏叡鏍囪瘑
+ private String commonId;
+ // 鍏叡鍚嶇О
+ private String commonName;
+ // 涓婄骇鍏叡鏍囪瘑
+ private String parentCommonId;
+ // 涓婄骇鍏叡鍚嶇О
+ private String parentCommonName;
+ // 椋庨櫓娴佸け绛夌骇
+ private String lossDevel;
+ // 寮�濮嬫棩鏈�
+ private Date startTime;
+ // 缁撴潫鏃ユ湡
+ private Date endTime;
+ // 鍏抽敭璇嶆煡璇� CIQ 浼氬憳鍚嶇О 鎵嬫満鍙�
+ private String keyWord;
+
+ public ProjectWarnRecordDto() {
+ }
+}
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
new file mode 100644
index 0000000..12f1a2c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -0,0 +1,41 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒掓墸
+ **/
+@Data
+public class CashierSettlementDto extends BaseQueryVo{
+ /**鏄惁鍗曢〉杩斿洖*/
+ private Integer selectReturn = 0;
+ /**寮�鍗曞紑濮嬫椂闂�*/
+ private Date startTime;
+ /**寮�鍗曠粨鏉熸椂闂�*/
+ private Date endTime;
+ /**鐢ㄦ埛绛夌骇*/
+ private String userMemberName;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**鏄惁鏄垵璇婂崟*/
+ private Integer isBothTheOne;
+ /**鎺ㄨ崘鍚嶇О*/
+ private String userInviteeName;
+ /**鎵�灞炲挩璇㈠笀*/
+ private String userCorpUserName;
+ /**鍟嗗搧鍚嶇О*/
+ private String goodsName;
+ /**璁㈠崟鎵�灞為棬搴�*/
+ private String shopId;
+ /**瀹㈡埛鎵�灞為棬搴�*/
+ private String userShopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
new file mode 100644
index 0000000..cb909f0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -0,0 +1,33 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒掓墸
+ **/
+@Data
+public class DeductionSurfaceDto extends BaseQueryVo{
+ /**寮�鍗曞紑濮嬫椂闂�*/
+ private Date startTime;
+ /**寮�鍗曠粨鏉熸椂闂�*/
+ private Date endTime;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+ /**鎵�灞炲挩璇㈠笀*/
+ private String hisCorpName;
+ /**鐘舵��:0鍙栨秷1杩囨湡2鏃犳晥3鍒掓墸瀹屾垚4鏈垝鎵�5鍒掓墸涓�*/
+ private Integer deductionStatus;
+ /**椤圭洰鍒嗙被*/
+ private String typeId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java
new file mode 100644
index 0000000..134554b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserAttentionProductDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鍏虫敞椤圭洰璁板綍
+ */
+@Data
+public class UserAttentionProductDto {
+
+ /**鐢ㄦ埛Id*/
+ private String userId;
+ /**鍏叡绫诲瀷(OrderItemConstants)*/
+ private String commonType;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+ /**鍏叡鍚嶇О*/
+ private String commonName;
+
+ /**璇锋眰鍙傛暟*/
+ private String pageRoute;
+ /**璇锋眰鍙傛暟*/
+ private String requestParameter;
+
+ public UserAttentionProductDto() {
+ }
+}
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 ed54f6e..4dd2935 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
@@ -26,9 +26,11 @@
/**鎵�灞為【闂悕绉�*/
private String beCorpUser;
/**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
- private Integer isSelectCorp;
+ private Integer isSelectCorp = 0;
/**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
- private Integer isSelectShop;
+ private Integer isSelectShop = 0;
+ /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+ private Integer isSelectInvitee = 0;
/**鏄惁鏈夐棬搴�*/
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
index 5369c16..d4eeecd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipProjectService.java
@@ -2,8 +2,8 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
-import com.hz.his.dto.consumables.GoodsQueryDto;
import com.hz.his.dto.project.ProjectQueryDto;
+import com.hz.his.dto.project.ProjectWarnRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,4 +33,9 @@
@PostMapping(value = "/project/detail")
Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto);
+ /**
+ * 寮�鏀惧钩鍙�-椤圭洰棰勮璁板綍鍒楄〃
+ */
+ @PostMapping(value = "/project/warn/record/list")
+ Result projectWarnRecordList(@RequestBody ProjectWarnRecordDto projectWarnRecordDto);
}
\ 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 3b66134..a76d5a6 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
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,4 +26,10 @@
@PostMapping(value = "/user/money/unclaimed/add")
Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
+ */
+ @PostMapping(value = "/user/money/info")
+ Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+
}
\ No newline at end of file
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 3ea198b..9dfbb91 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,10 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserInviteeInfoDto;
-import com.hz.his.dto.user.UserListDto;
-import com.hz.his.dto.user.UserParamDto;
-import com.hz.his.dto.user.UserUnionDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
import net.sf.json.JSONObject;
@@ -81,4 +78,10 @@
*/
@PostMapping("user/invitee/info")
Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto);
+
+ /**
+ * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
+ */
+ @PostMapping("/attention/product/record/edit")
+ Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java
new file mode 100644
index 0000000..467baff
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.CashierSettlementDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
+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-cashier-settlement")
+public interface BiCashierSettlementService {
+
+ /**
+ * 鍑虹撼缁撶畻鍒楄〃
+ */
+ @PostMapping("/cashier/settlement/common/list")
+ Result cashierSettlementList(@RequestBody CashierSettlementDto cashierSettlementDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
new file mode 100644
index 0000000..17fc49a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ClinicPerfReqDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
+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-deduction-surface")
+public interface BiDeductionService {
+
+ /**
+ * 鏈墽琛屾槑缁嗗垪琛�
+ */
+ @PostMapping("/deduction/surface/list")
+ Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java
new file mode 100644
index 0000000..b74061a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java
@@ -0,0 +1,21 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+/**
+ * 浣滃簾閫�娆惧疄浣撶粨鏋�
+ * @author CJH
+ */
+@Data
+public class RefundCancelVo {
+
+ /**閫�娆惧崟鏍囪瘑-蹇呭～*/
+ private String id;
+ /**浣滃簾澶囨敞-蹇呭～*/
+ private String remarks;
+ /**鎿嶄綔鍛樺伐-蹇呭～*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊-蹇呭～*/
+ private String staffRoleId;
+
+}
--
Gitblit v1.8.0