From 194fbb628f82b1bbf15a6c649fffcacf922f4391 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 19 十月 2023 18:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java | 29 +++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java | 4 ++++
5 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
index 190dc23..58569fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -42,6 +42,8 @@
/**鏄惁鏌ヨ绉垎璁㈠崟*/
private Integer isIntegral;
- //鏄惁鏌ヨ宸插畬鎴愯鍗�
+ /**鏄惁鏌ヨ宸插畬鎴愯鍗�*/
private Integer isSuc;
+ /**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
+ private Integer isGroupBuy;
}
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 bee390c..c789dff 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
@@ -101,4 +101,6 @@
private String treatSingleId;
/** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
private String addWay;
+ /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+ private Integer isGroupBuy;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java
new file mode 100644
index 0000000..7bfb1c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopIndicatorsDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.report;
+import java.util.List;
+
+/***
+ * 闂ㄥ簵-鍜ㄨ甯� 鎸囨爣鏁版嵁 dto
+ */
+public class ShopIndicatorsDto {
+
+ //鍙傛暟
+ private List<String> shopIdList;
+ private List<String> timeList;
+
+ public List<String> getShopIdList() {
+ return shopIdList;
+ }
+
+ public void setShopIdList(List<String> shopIdList) {
+ this.shopIdList = shopIdList;
+ }
+
+ public List<String> getTimeList() {
+ return timeList;
+ }
+
+ public void setTimeList(List<String> timeList) {
+ this.timeList = timeList;
+ }
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
index 0d5b16d..5066ee7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -30,6 +30,10 @@
@PostMapping(value = "/market/activity/detail")
Result detail(@RequestBody MarketActivityDto dto);
+ /** 纭鏌ョ湅 */
+ @PostMapping(value = "/market/activity/confirmView")
+ Result confirmView(@RequestBody MarketActivityDto dto);
+
/** 棰嗗彇浼樻儬鍒� */
@PostMapping(value = "/market/activity/receiveCoupon")
Result receiveCoupon(@RequestBody MarketActivityDto dto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java
new file mode 100644
index 0000000..a9d461c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopIndicatorsService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.ShopIndicatorsDto;
+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-shop-indicators")
+public interface BiShopIndicatorsService {
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃 */
+ @PostMapping("/admin/shop/indicators/list")
+ Result shopEmpDeductionList(@RequestBody(required = false) ShopIndicatorsDto shopIndicatorsDto);
+
+}
\ No newline at end of file
--
Gitblit v1.8.0