From 74527e7ce6ab1a5e09d3d4936e5157188e983e49 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 二月 2024 16:12:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java | 21 +++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 2 ++
4 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index 249de13..734e310 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -33,6 +33,8 @@
private List<String> orderIdList;
/** 璁㈠崟鏍囪瘑 */
private String orderId;
+ /** 鏍囧織鏍囪瘑 */
+ private String commonId;
/**瑕佺粨璐︽搷浣滃钩鍙癆PPID*/
private String appId;
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 edd4d5c..0270bca 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
@@ -41,4 +41,6 @@
public static final String TYPE_COMMON_ORDER = "order";
/**鍏叡鏍囪瘑绫诲瀷,鎶藉娲诲姩*/
public static final String TYPE_COMMON_DRAW = "draw";
+ /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
}
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 88939d7..d938304 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
@@ -384,4 +384,11 @@
@PostMapping(value = "/user/merge/log")
Result userMergeLog(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛VIP璁板綍浠ュ強瑕侀鍙栫殑浼樻儬鍒�,浼爑serId瀛楁
+ * */
+ @PostMapping(value = "/user/vip/log/coupon")
+ Result userVipLogCoupon(@RequestBody UserDto userDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
index 28407e3..e3aa29c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
+import com.hz.his.dto.report.PerformanceReqParamsDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +37,24 @@
*/
@PostMapping("/admin/export/shop/spa/project/indicators/list")
Result projectIndicatorsList(@RequestBody ShopReportDto shopReportDto);
+
+
+ /**
+ * SPA闂ㄥ簵鏈堟墽琛屾暟鎹�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/new")
+ Result monthDeductionNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾暟鎹�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new")
+ Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁嗗鍑�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")
+ Result monthDeductionEmpExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
}
--
Gitblit v1.8.0