Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into...

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into dev_member_voucher_refund_09151

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java

+package com.liquidnet.service.feign.kylin.api;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.feign.kylin.config.SecuringRequestInterceptor;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import feign.hystrix.FallbackFactory;
+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.HashMap;
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: FeignKylinForChimeClient
+ * @Package com.liquidnet.service.feign.kylin.api
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/9/11 18:20
+ */
+@Component
+@FeignClient(name = "liquidnet-service-kylin",
+        contextId = "FeignKylinForChimeClient", path = "",
+        url = "${liquidnet.service.kylin.url}",
+        fallback = FallbackFactory.Default.class,
+        configuration = SecuringRequestInterceptor.class)
+public interface FeignKylinForChimeClient {
+    @GetMapping("myPerformance/performancesList")
+    ResponseDto<List<KylinPerformanceVo>> myPerformancesList();
+
+
+    @GetMapping("performance/localList")
+    ResponseDto<HashMap<String, Object>> localList(
+            @RequestParam(value = "cityName",defaultValue = "") String cityName,
+            @RequestParam(value = "days",defaultValue = "0") int days,
+            @RequestParam(value = "type",defaultValue = "0") int type,
+
+            @RequestParam(value = "isDiscount",defaultValue = "") Integer isDiscount,
+            @RequestParam(value = "isAdvance",defaultValue = "") Integer isAdvance,
+            @RequestParam(value = "isExclusive",defaultValue = "") Integer isExclusive,
+
+            // 排序
+            @RequestParam(value = "orderBy",defaultValue = "") String orderBy,
+            @RequestParam(value = "sort",defaultValue = "") String sort
+    );
+
+//    @GetMapping(value = "/performance/list")
+//    ResponseDto<List<KylinPerformanceVo>> performanceList(@RequestParam("performancesIds") String... performancesIds);
+
+    @GetMapping("myPerformance/getDetail")
+    ResponseDto<KylinPerformanceVo> getDetail(
+            @RequestParam("performancesId") String performancesId
+    );
+}

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/config/SecuringRequestInterceptor.java

+package com.liquidnet.service.feign.kylin.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: 解决feign调用传递header问题
+ * @class: SecuringRequestInterceptor
+ * @Package com.liquidnet.service.chime.config
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/9/11 19:22
+ */
+@Component
+public class SecuringRequestInterceptor implements RequestInterceptor {
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        Enumeration<String> headerNames = request.getHeaderNames();
+        if (headerNames != null) {
+            while (headerNames.hasMoreElements()) {
+                String name = headerNames.nextElement();
+                String values = request.getHeader(name);
+                requestTemplate.header(name, values);
+            }
+        }
+    }
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinMyPerformancesController.java

 package com.liquidnet.service.kylin.controller;
 
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -36,4 +37,26 @@ public class KylinMyPerformancesController {
         List<KylinPerformanceVo> result = kylinPerformancesService.myPerformancesList();
         return ResponseDto.success(result);
     }
+
+
+    @GetMapping("getDetail")
+    @ApiOperation("演出详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "path", dataType = "String", name = "performancesId", value = "演出id", required = true)
+    })
+    public ResponseDto<KylinPerformanceVo> getDetail(
+            @RequestParam("performancesId") String performancesId
+    ) {
+        try {
+            KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, 0, 0, "0");
+            if (result != null) {
+                return ResponseDto.success(result);
+            } else {
+                return ResponseDto.failure(ErrorMapping.get("20700"));
+            }
+        } catch (Exception e) {
+            log.error("演出详情Error", e);
+            return ResponseDto.failure(ErrorMapping.get("20700"));
+        }
+    }
 }