增加快递相关列表

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinBuyNoticePartnerService.java

@@ -2,9 +2,13 @@ package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 
+import java.util.List;
+
 /**
  * <p>
  * 购票须知表 服务类
@@ -17,8 +21,11 @@ public interface IKylinBuyNoticePartnerService {
 
     /**
      * 购票须知列表
+     *
      * @return 分页 mysql 数据
      */
     PageInfo<KylinBuyNoticeVo> getBuyNotice();
 
+    ResponseDto<List<KylinExpressModuleVo>> getExpressList();
+
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/KylinBuyNoticeParnterController.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.merchant.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
 import com.liquidnet.service.merchant.util.InnerUtils;
@@ -29,7 +30,7 @@ import java.util.List;
  */
 @Api(tags = "第三方-购票须知", position = 1004)
 @RestController
-@RequestMapping("partner/buyNotice")
+@RequestMapping("partner/api")
 public class KylinBuyNoticeParnterController {
 
     @Autowired
@@ -37,7 +38,7 @@ public class KylinBuyNoticeParnterController {
     @Autowired
     InnerUtils innerUtils;
 
-    @GetMapping(value = "")
+    @GetMapping(value = "buyNotice")
     @ApiOperation(value = "购票须知列表", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<List<KylinBuyNoticeVo>> getBuyNotice() {
@@ -49,11 +50,17 @@ public class KylinBuyNoticeParnterController {
         }
     }
 
-    @GetMapping(value = "string")
+    @GetMapping(value = "buyNotice/string")
     @ApiOperation(value = "购票须知列表String", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> getBuyNoticeJsonString(@RequestParam("buyNoticeId") String buyNoticeId) {
         return ResponseDto.success(innerUtils.getBuyNoticeJsonString(Arrays.asList(buyNoticeId.split(","))));
     }
 
+    @GetMapping(value = "expressList")
+    @ApiOperation(value = "快递类型列表", position = 1)
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<List<KylinExpressModuleVo>> getExpressList() {
+        return buyNoticePartnerService.getExpressList();
+    }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinBuyNoticePartnerServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
@@ -25,7 +27,7 @@ import java.util.List;
  * @since 2021-05-18
  */
 @Service
-public class KylinBuyNoticePartnerServiceImpl  implements IKylinBuyNoticePartnerService {
+public class KylinBuyNoticePartnerServiceImpl implements IKylinBuyNoticePartnerService {
 
     @Autowired
     RedisMerchantUtils merchantUtils;
@@ -37,4 +39,10 @@ public class KylinBuyNoticePartnerServiceImpl  implements IKylinBuyNoticePartner
         return pageInfoTmp;
     }
 
+    @Override
+    public ResponseDto<List<KylinExpressModuleVo>> getExpressList() {
+        return ResponseDto.success(merchantUtils.expressList());
+    }
+
+
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/RedisMerchantUtils.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.merchant.util;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
@@ -243,4 +244,18 @@ public class RedisMerchantUtils {
         } else {
         }
     }
+
+    /**
+     * 可选快递方式列表
+     * @return
+     */
+    public List<KylinExpressModuleVo> expressList() {
+        String redisKey = KylinRedisConst.KYLIN_EXPRESS_MODULES;
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
+            return null;
+        } else {
+            return (List<KylinExpressModuleVo>) obj;
+        }
+    }
 }