From 2e46f1aeebcc7eead18e3c0359518cf7ef402147 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 22 二月 2024 16:19:58 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
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 | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 8 ++++++++
3 files changed, 16 insertions(+), 0 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 0270bca..2234f92 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
@@ -43,4 +43,6 @@
public static final String TYPE_COMMON_DRAW = "draw";
/**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
+ /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 3c0120d..c5bb717 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -1,5 +1,7 @@
package com.hz.his.dto.order;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -105,4 +107,10 @@
private String addWay;
/**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
private Integer isGroupBuy;
+
+ /**娲诲姩椤甸潰绫诲瀷锛�0榛樿鏍囧噯锛夛紝濡傛灉闇�瑕佺壒闇�澶勭悊锛屽～鍐欒繖涓紝榛樿0*/
+ private Integer activityPageType = 0;
+ /**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/
+ private String activityPageCode;
+
}
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 e3aa29c..638aa84 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
@@ -52,6 +52,12 @@
Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
/**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/list/all")
+ Result monthDeductionEmpList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
* SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁嗗鍑�
*/
@RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")
--
Gitblit v1.8.0