From fcbe29760373012bae67ef8d95b587158df72304 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期六, 06 五月 2023 16:02:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 39 +++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierSettlementService.java | 25 ++++++++++++
2 files changed, 64 insertions(+), 0 deletions(-)
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..1de6fbf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -0,0 +1,39 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒掓墸
+ **/
+@Data
+public class CashierSettlementDto extends BaseQueryVo{
+
+ /**寮�鍗曞紑濮嬫椂闂�*/
+ private Date startTime;
+ /**寮�鍗曠粨鏉熸椂闂�*/
+ private Date endTime;
+ /**鐢ㄦ埛绛夌骇*/
+ private String userMemberName;
+ /**璁㈠崟鍙�*/
+ private String orderNo;
+ /**鏄惁鏄垵璇婂崟*/
+ private Integer isBothTheOne;
+ /**鎺ㄨ崘鍚嶇О*/
+ private String userInviteeName;
+ /**鎵�灞炲挩璇㈠笀*/
+ private String userCorpUserName;
+ /**鎵�灞為棬搴�*/
+ private String userShopName;
+ /**鍟嗗搧鍚嶇О*/
+ private String goodsName;
+
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+}
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);
+
+
+}
--
Gitblit v1.8.0