From 15a504033f949ba6e8b9cf712a8a70052bc7d6a8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期日, 25 六月 2023 10:20:23 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 32 ++++++++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 31 +++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 9 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java | 14 +++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 47 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java | 4 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 13 +--
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 31 +++++++
10 files changed, 178 insertions(+), 11 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 1e89f21..e05dee0 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
@@ -40,6 +40,8 @@
//////绯荤粺鍙傛暟
/** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal totalAmount;
+ /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
/** 鍙��娆炬柟寮忛泦鍚� */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
index 7cdcddd..6416aed 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
@@ -22,4 +22,8 @@
private String chatCorpUserId;
//鍓嶇疆澶╂暟
private Integer leadDays;
+
+ //鎿嶄綔浜�
+ private String operatorId;
+ private String operatorName;
}
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 325f280..3768939 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
@@ -5,6 +5,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.Date;
+
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@Data
@@ -37,6 +39,9 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
- /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
- private String appId;
+
+ private Date startTime;
+
+ private Date endTime;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 34dc498..cb058e1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -295,4 +295,10 @@
* */
@PostMapping(value = "/user/first/day/consumption")
Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
index 4b2f735..da3e69f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
@@ -16,7 +16,7 @@
public interface BiTmkPerfService {
/**
- * 璁㈠崟涓氱哗鏄庣粏鍒楄〃
+ * 鐢电綉涓氱哗鏄庣粏鍒楄〃
*/
@PostMapping("/admin/tmk/perf/orderPerfList")
Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
@@ -33,5 +33,17 @@
@PostMapping("/admin/tmk/perf/summary/sumData")
Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+ /**
+ * 鐢电綉涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/tmk/perf/orderPerfExport")
+ Result export(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
+ /**
+ * 鐢电綉涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/tmk/perf/summary/export")
+ Result sumExport(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
}
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
index e159665..e6207fc 100644
--- 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
@@ -1,11 +1,8 @@
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 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;
@@ -21,21 +18,21 @@
* 鏃犺浆鎹�
*/
@PostMapping(value = "/exp/cashier/settlement")
- Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+ Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鏀堕摱鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/cashier/surface")
- Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+ Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鍒掓墸鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/deduction/surface")
- Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+ Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
new file mode 100644
index 0000000..9da7033
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -0,0 +1,32 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author CJH
+ * 閫�鍥炴敮浠樿褰曟墿灞�
+ */
+@Data
+public class RefundMethodVo {
+
+ /** 鍙��鏀粯鏂瑰紡缂栫爜 */
+ private String payMethodNo;
+ /** 鍙��鏀粯鏂瑰紡鍚嶇О */
+ private String payMethodName;
+ /** 鍙��鏀粯閲戦 */
+ private BigDecimal payTotal;
+ /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPay;
+ /**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecute;
+
+ /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundNumberNo;
+ /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundNumberName;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
+ private BigDecimal refundTotal;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
new file mode 100644
index 0000000..bcdaa7e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
@@ -0,0 +1,31 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉冪泭
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardEquityVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardEquityId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardEquityName;
+ /** 閫�娆惧崱椤规潯鐩� */
+ private List<RefundUserCardItemVo> refundUserCardItemVoList;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
new file mode 100644
index 0000000..4b23d21
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
@@ -0,0 +1,31 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉＄洰
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardItemVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardItemInfoId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardItemInfoName;
+ /**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/
+ private Integer refundQuantity;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
new file mode 100644
index 0000000..ab500f3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -0,0 +1,47 @@
+package com.hz.his.vo.order.refund.card;
+
+
+import com.hz.his.vo.order.refund.RefundMethodVo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
+ *
+ */
+@Data
+public class RefundUserCardVo {
+
+ /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+ private String userCardId;
+ /** 鐢ㄦ埛鍗″寘鍚嶇О */
+ private String userCardName;
+
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
+
+ /** 鍗￠」鏉冪泭 */
+ private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
+ /**鏀粯鏂瑰紡*/
+ private List<RefundMethodVo> payMethodVos;
+ /**閫�娆炬敮浠樻柟寮�*/
+ private List<RefundMethodVo> refundMethodVos;
+
+ //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+}
--
Gitblit v1.8.0