From 188870750c8f1a8f0023c410cdd1ed9d8a2e09e7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 21 八月 2023 19:31:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java | 14 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 6 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java | 42 +++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 7 +++
5 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
index db55fe3..6a6b5c5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -29,6 +29,8 @@
private String commonId;
/**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
private String commonType;
+ /**鏉ユ簮瀛愭爣璇�*/
+ private String commonItemId;
/**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
private List<CouponSendUserDto> sendUserList;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
new file mode 100644
index 0000000..f40547c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.coupon;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponTypeDto extends PageDto {
+ /**鏄惁钀ラ攢鍔╂墜鍙敵璇�*/
+ private Integer isMarketAssistantApply;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index afef51e..500b7d8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
@@ -33,4 +34,9 @@
private Integer isNewUser;
/**鏄惁棣栧ぉ*/
private Integer isBothOne;
+ /**宸ヤ綔鏃�*/
+ private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 656629c..a7eac39 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -132,9 +132,14 @@
Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
/**
- * 鏌ヨ浼樻儬鍒稿垎绫�
+ * 鏌ヨ鍩虹鍒嗙被
*/
@PostMapping(value = "/coupon/type/list")
Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+ /**
+ * 鏌ヨ浼樻儬鍒稿垎绫�
+ */
+ @PostMapping(value = "/couponType/list")
+ Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
new file mode 100644
index 0000000..b8ec30d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
@@ -0,0 +1,42 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+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-arrive-report")
+public interface BiArriveReportService {
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁
+ */
+ @PostMapping("/report/arrive/shop/list")
+ Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�
+ */
+ @PostMapping("/report/arrive/employee/list")
+ Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/shop/list/export")
+ Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/employee/list/export")
+ Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
--
Gitblit v1.8.0