From aa2c3d4deba76ade0958ff3ced88396e226a4964 Mon Sep 17 00:00:00 2001
From: duhuizhe <271000472@qq.com>
Date: 星期三, 15 五月 2024 19:57:40 +0800
Subject: [PATCH] 项目启动失败问题解决

---
 ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/client/ShopServiceClient.java |  167 +++++++++++++++++++++++++++----------------------------
 1 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/client/ShopServiceClient.java b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/client/ShopServiceClient.java
index 9b2e4b3..6155116 100644
--- a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/client/ShopServiceClient.java
+++ b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/client/ShopServiceClient.java
@@ -1,84 +1,83 @@
-package com.nuvole.four.client;
-
-import com.nuvole.common.domain.result.CommonResult;
-import com.nuvole.common.domain.result.PageBean;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鏂规硶鎻忚堪: 璋冪敤service-shop妯″潡
- *
- * @date  2024-04-14 18:31
- **/
-@Component
-@FeignClient(value = "service-shop", fallbackFactory = ShopClientFallbackFactory.class)
-public interface ShopServiceClient {
-
-    /**
-     * 鏂规硶鎻忚堪: 鏌ヨ搴楅摵鍒楄〃
-     *
-     * @date  2024-04-14 18:31
-     **/
-    @GetMapping(value = "/v1/shop/pc/storeMerchantShop/getMerchantShopExtendList", consumes = "application/json")
-    CommonResult<PageBean<Map>> getMerchantShopExtendList(
-            @RequestParam("queryOrgCode") String queryOrgCode,
-            @RequestParam("merchantId") String merchantId,
-            @RequestParam("shopName") String shopName,
-            @RequestParam("managerName") String managerName,
-            @RequestParam("channelId") String channelId,
-            @RequestParam("channelIdNotNull") String channelIdNotNull,
-            @RequestParam("pageNumber") Integer pageNumber, @RequestParam("pageSize") Integer pageSize);
-
-    @GetMapping(value = "/v1/shop/pc/storeMerchantShop/selectShopMsgByIds")
-    List<Map> selectShopMsgByIds(
-            @RequestParam("ids") String ids);
-
-    /**
-     * 鍟嗘埛娲诲姩鏁版嵁缁熻-鍒楄〃
-     * @param orgCode       鏈烘瀯code
-     * @param channelId     閫氶亾id
-     * @param activityId    娲诲姩id
-     * @param startDate     浜ゆ槗鏃堕棿
-     * @param pageNumber    椤电爜
-     * @param pageSize      姣忛〉鏉℃暟
-     * @return  鍟嗘埛娲诲姩鏁版嵁缁熻-鍒楄〃
-     */
-    @GetMapping(value = "/v1/shop/pc/static/report/merchant/activity/list")
-    CommonResult<PageBean<Map>> merchantActivityList(
-                @RequestParam("orgCode") String orgCode,
-                @RequestParam("channelId") Long channelId,
-                @RequestParam("activityId") Long activityId,
-                @RequestParam("startDate") Date startDate,
-                @RequestParam("endDate") Date endDate,
-                @RequestParam("pageNumber") Integer pageNumber,
-                @RequestParam("pageSize") Integer pageSize
-            );
-
-    /**
-     * 鍟嗘埛娲诲姩鏁版嵁缁熻-鏁版嵁姹囨��
-     * @param orgCode       鏈烘瀯code
-     * @param channelId     閫氶亾id
-     * @param activityId    娲诲姩id
-     * @param startDate     浜ゆ槗寮�濮嬫椂闂�
-     * @param endDate       浜ゆ槗缁撴潫鏃堕棿
-     * @return  鍟嗘埛娲诲姩鏁版嵁缁熻-鏁版嵁姹囨��
-     */
-    @GetMapping(value = "/v1/shop/pc/static/report/merchant/activity/collect")
-    CommonResult<Map> merchantActivityCollect(
-            @RequestParam("orgCode") String orgCode,
-            @RequestParam("channelId") Long channelId,
-            @RequestParam("activityId") Long activityId,
-            @RequestParam("startDate") Date startDate,
-            @RequestParam("endDate") Date endDate
-    );
-
-
-
-
-}
+//package com.nuvole.four.client;
+//
+//import com.nuvole.common.domain.result.CommonResult;
+//import com.nuvole.common.domain.result.PageBean;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * 鏂规硶鎻忚堪: 璋冪敤service-shop妯″潡
+// *
+// * @date  2024-04-14 18:31
+// **/
+//@Component
+////@FeignClient(value = "service-shop", fallbackFactory = ShopClientFallbackFactory.class)
+//public interface ShopServiceClient {
+//
+//    /**
+//     * 鏂规硶鎻忚堪: 鏌ヨ搴楅摵鍒楄〃
+//     *
+//     * @date  2024-04-14 18:31
+//     **/
+//    @GetMapping(value = "/v1/shop/pc/storeMerchantShop/getMerchantShopExtendList", consumes = "application/json")
+//    CommonResult<PageBean<Map>> getMerchantShopExtendList(
+//            @RequestParam("queryOrgCode") String queryOrgCode,
+//            @RequestParam("merchantId") String merchantId,
+//            @RequestParam("shopName") String shopName,
+//            @RequestParam("managerName") String managerName,
+//            @RequestParam("channelId") String channelId,
+//            @RequestParam("channelIdNotNull") String channelIdNotNull,
+//            @RequestParam("pageNumber") Integer pageNumber, @RequestParam("pageSize") Integer pageSize);
+//
+//    @GetMapping(value = "/v1/shop/pc/storeMerchantShop/selectShopMsgByIds")
+//    List<Map> selectShopMsgByIds(
+//            @RequestParam("ids") String ids);
+//
+//    /**
+//     * 鍟嗘埛娲诲姩鏁版嵁缁熻-鍒楄〃
+//     * @param orgCode       鏈烘瀯code
+//     * @param channelId     閫氶亾id
+//     * @param activityId    娲诲姩id
+//     * @param startDate     浜ゆ槗鏃堕棿
+//     * @param pageNumber    椤电爜
+//     * @param pageSize      姣忛〉鏉℃暟
+//     * @return  鍟嗘埛娲诲姩鏁版嵁缁熻-鍒楄〃
+//     */
+//    @GetMapping(value = "/v1/shop/pc/static/report/merchant/activity/list")
+//    CommonResult<PageBean<Map>> merchantActivityList(
+//                @RequestParam("orgCode") String orgCode,
+//                @RequestParam("channelId") Long channelId,
+//                @RequestParam("activityId") Long activityId,
+//                @RequestParam("startDate") Date startDate,
+//                @RequestParam("endDate") Date endDate,
+//                @RequestParam("pageNumber") Integer pageNumber,
+//                @RequestParam("pageSize") Integer pageSize
+//            );
+//
+//    /**
+//     * 鍟嗘埛娲诲姩鏁版嵁缁熻-鏁版嵁姹囨��
+//     * @param orgCode       鏈烘瀯code
+//     * @param channelId     閫氶亾id
+//     * @param activityId    娲诲姩id
+//     * @param startDate     浜ゆ槗寮�濮嬫椂闂�
+//     * @param endDate       浜ゆ槗缁撴潫鏃堕棿
+//     * @return  鍟嗘埛娲诲姩鏁版嵁缁熻-鏁版嵁姹囨��
+//     */
+//    @GetMapping(value = "/v1/shop/pc/static/report/merchant/activity/collect")
+//    CommonResult<Map> merchantActivityCollect(
+//            @RequestParam("orgCode") String orgCode,
+//            @RequestParam("channelId") Long channelId,
+//            @RequestParam("activityId") Long activityId,
+//            @RequestParam("startDate") Date startDate,
+//            @RequestParam("endDate") Date endDate
+//    );
+//
+//
+//
+//
+//}

--
Gitblit v1.9.1