From 2b62d695b988ee6eefd0b516b2497840dfbac340 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 14 十二月 2022 10:52:58 +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/file/FileExportDto.java | 46 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4
phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java | 27 ++++
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java | 25 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 41 ++++++
phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java | 27 ++++
phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java | 20 +++
phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java | 12 ++
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java | 20 +++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 10 +
phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java | 27 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java | 28 ++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 4
phis-feign/src/main/java/com/hz/his/dto/file/FileExUpdateDto.java | 28 ++++
14 files changed, 315 insertions(+), 4 deletions(-)
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 a2c339b..92423d0 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
@@ -27,6 +27,8 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
- /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+ /**鍏叡鏍囪瘑绫诲瀷,绀煎搧鍗�*/
public static String TYPE_COMMON_GIFT = "gift";
+ /**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
+ public static String TYPE_COMMON_MARKE = "marketing";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileExUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileExUpdateDto.java
new file mode 100644
index 0000000..07a3c73
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileExUpdateDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**
+ * 鏂囦欢瀵煎嚭鎵╁睍
+ **/
+@Data
+public class FileExUpdateDto {
+ /****************蹇呭～椤�***********************/
+ /**瀵煎嚭璁板綍鏍囪瘑*/
+ private String id;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**浠诲姟鐘舵�� phi-common FileStatusEnum*/
+ private Integer status;
+ /**鎴愬姛鏂囦欢瀛樺偍鍚嶇О*/
+ private String fileName;
+
+ /****************闈炲繀濉」***********************/
+ /**鎴愬姛鏂囦欢瀛樺偍鍦板潃*/
+ private String fileUrl;
+ /**閿欒淇℃伅*/
+ private String errMsg;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java
new file mode 100644
index 0000000..b07f155
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java
@@ -0,0 +1,46 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**
+ * 鏂囦欢瀵煎嚭鎵╁睍
+ **/
+@Data
+public class FileExportDto {
+ /****************蹇呭～椤�***********************/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**鎿嶄綔鐩爣瀵硅薄(phi-common FileTargetEnum)*/
+ private Integer opTarget;
+
+
+ /****************闈炲繀濉」*****************************/
+ /**鎴愬姛鏂囦欢瀛樺偍鍦板潃*/
+ private String fileUrl;
+ /**鎿嶄綔鍐呭鍚嶇О(phi-common FileTargetEnum)*/
+ private String opName;
+ /**浠诲姟鐘舵�� phi-common FileStatusEnum*/
+ private Integer status;
+ /**鎿嶄綔鏃堕棿*/
+ private String opTime;
+ /**瀵煎叆(瀵煎嚭)鏂囦欢鍚�*/
+ private String opFileName;
+ /**瀵煎叆(瀵煎嚭)鏂囦欢鏁版嵁鏉℃暟*/
+ private Integer number;
+ /**瀵煎叆(瀵煎嚭)杩涘害*/
+ private Double percent;
+ /**瀵煎叆(瀵煎嚭)杩涘害*/
+ private String completeTime;
+ /**鎴愬姛鏂囦欢瀛樺偍鍚嶇О*/
+ private String fileName;
+ /**澶辫触鏂囦欢瀛樺偍鍚�*/
+ private String failName;
+ /**澶辫触鎻愮ず鏂囦欢瀛樺偍鍦板潃*/
+ private String failUrl;
+ /**澶囨敞淇℃伅*/
+ private String remarks;
+ /**閿欒淇℃伅*/
+ private String errMsg;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
new file mode 100644
index 0000000..0f6c7e5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPartRefundDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.order.OrdersTotalDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆剧敵璇峰叆鍙�
+ * @author fwq
+ */
+@Data
+public class OrderPartRefundDto extends MarketingDto{
+ /*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
+ /**鏈閫�娆剧敵璇锋�婚噾棰�*/
+ private BigDecimal refundTotal;
+ /**鏈閫�娆炬敮浠樻柟寮�*/
+ private List<PartRefundPayDto> partRefundPayDtoList;
+ /**鏈閫�娆鹃」鐩�*/
+ private List<RefundProjectDto> refundProjectDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
new file mode 100644
index 0000000..dac1e47
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/PartRefundPayDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 閮ㄥ垎閫�娆剧敵璇�-鏀粯鏂瑰紡鏄庣粏
+ * */
+@Data
+public class PartRefundPayDto {
+ /**閫�娆炬敮浠樻柟寮忔爣璇�*/
+ private String payMethodId;
+ /**閫�娆炬敮浠樻柟寮忕紪鍙�*/
+ private String payMethodNo;
+ /**閫�娆炬敮浠樻柟寮忓悕绉�*/
+ private String payMethodName;
+ /**鏀粯鏂瑰紡鐨勯��娆鹃噾棰�*/
+ private BigDecimal refundMoney;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
new file mode 100644
index 0000000..41682b1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing;
+
+import lombok.Data;
+
+/**
+ * 閮ㄥ垎閫�娆剧敵璇�-鏀粯鏂瑰紡鏄庣粏
+ * */
+@Data
+public class RefundProjectDto {
+ /**閫�鐨勭被鍨�: OrderItemConstants*/
+ private String projectType;
+ /**閫�鐨勬爣璇� 鍟嗗搧/椤圭洰/...*/
+ private String projectId;
+ /**閫�鐨勭紪鍙� 鍟嗗搧/椤圭洰/...*/
+ private String projectNo;
+ /**閫�鐨勫悕绉� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
+ private String projectName;
+ /**閫�鐨勬暟閲� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
+ private Integer refundNum;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 3b663d6..523328a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -3,12 +3,10 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
+import com.hz.his.dto.marketing.OrderPartRefundDto;
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;
/**
* 钀ラ攢鍔╂墜
@@ -30,4 +28,10 @@
Result applyOrderCancel(@RequestBody OrderCancelDto orderCancelDto);
+ /**
+ * 璁㈠崟閮ㄥ垎閫�娆剧敵璇�
+ */
+ @PostMapping(value = "/order/apply/part/refund")
+ Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 9462bd1..7f1e96e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -60,4 +60,8 @@
@PostMapping(value = "/emp/userId/role/check")
Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);
+ @PostMapping(value = "/emp/role/liset")
+ Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java
new file mode 100644
index 0000000..d9890cd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java
@@ -0,0 +1,28 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.file.FileExUpdateDto;
+import com.hz.his.dto.file.FileExportDto;
+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-file")
+public interface SPhipFileService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢熸垚瀵煎嚭鏂囦欢璁板綍
+ * 杞崲FileExportDt
+ */
+ @PostMapping(value = "/file/common/export/getId")
+ Result getFileExportRecord(@RequestBody FileExportDto fileExportDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢熸垚瀵煎嚭鏂囦欢璁板綍
+ */
+ @PostMapping(value = "/file/common/export/update")
+ Result updateRecordById(@RequestBody FileExUpdateDto fileExUpdateDto);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
new file mode 100644
index 0000000..e159665
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -0,0 +1,41 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.file.FileExUpdateDto;
+import com.hz.his.dto.file.FileExportDto;
+import com.hz.his.vo.bi.exp.CashierSettlementVo;
+import com.hz.his.vo.bi.exp.CashierSurfaceVo;
+import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**bi鐨勫鍑虹▼搴�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-export")
+public interface SExportService {
+
+ /**
+ * 瀵煎嚭鍑虹撼缁撶畻琛�
+ * 鏃犺浆鎹�
+ */
+ @PostMapping(value = "/exp/cashier/settlement")
+ Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+
+ /**
+ * 瀵煎嚭鏀堕摱鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/cashier/surface")
+ Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+
+ /**
+ * 瀵煎嚭鍒掓墸鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface")
+ Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java
new file mode 100644
index 0000000..68461dc
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鍑虹撼缁撶畻
+ * @author CJH
+ */
+@Data
+public class CashierSettlementVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java
new file mode 100644
index 0000000..f581f7d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鏀堕摱鎶ヨ〃
+ * @author CJH
+ */
+@Data
+public class CashierSurfaceVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java
new file mode 100644
index 0000000..2a20847
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鍒掓墸鎶ヨ〃
+ * @author CJH
+ */
+@Data
+public class DeductionSurfaceVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java b/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java
new file mode 100644
index 0000000..fd3ae6a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java
@@ -0,0 +1,12 @@
+package com.hz.phis.dt.file;
+
+import lombok.Data;
+
+/**
+ * 鏂囦欢瀵煎嚭鎵╁睍
+ **/
+@Data
+public class FileExportDt {
+ /**璁板綍鏍囪瘑*/
+ private String id;
+}
--
Gitblit v1.8.0