Merge remote-tracking branch 'origin/master' into jxl_0223_msg

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -112,6 +112,8 @@ liquidnet:
       ticketSystemUrl: http://dev-report.capapiao.com
       appId: 11920532
       secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+    slime:
+      url: http://devslime.zhengzai.tv
     executor-main:
       xxl:
         admin:

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -114,6 +114,8 @@ liquidnet:
       ticketSystemUrl: http://dev-report.capapiao.com/
       appId: 11920532
       secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+    slime:
+      url: http://testslime.zhengzai.tv
     executor-main:
       xxl:
         admin:

liquidnet-bus-feign/liquidnet-api-feign-slime/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-bus-feign</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-api-feign-slime</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-slime-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

liquidnet-bus-feign/liquidnet-api-feign-slime/src/main/java/com/liquidnet/service/feign/slime/api/FeignSlimeApiClient.java

+package com.liquidnet.service.feign.slime.api;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
+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;
+
+@Component
+@FeignClient(name = "liquidnet-service-slime",
+        contextId = "FeignSlimeApiClient", path = "slime",
+        url = "${liquidnet.service.slime.url}",
+        fallback = FallbackFactory.Default.class)
+public interface FeignSlimeApiClient {
+
+    @GetMapping("fields/app/details")
+    ResponseDto<SlimeFieldsDetailsVo> fieldDetails(@RequestParam("fieldId") String fieldId);
+}

liquidnet-bus-feign/pom.xml

@@ -20,6 +20,7 @@
         <module>liquidnet-api-feign-chime</module>
         <module>liquidnet-api-feign-stone</module>
         <module>liquidnet-api-feign-candy</module>
+        <module>liquidnet-api-feign-slime</module>
         <!--        <module>liquidnet-api-feign-sequence</module>-->
 <!--        <module>liquidnet-api-feign-example</module>-->
 <!--        <module>liquidnet-api-feign-account</module>-->

liquidnet-bus-service/liquidnet-service-sweet/pom.xml

@@ -111,6 +111,12 @@
             <artifactId>liquidnet-api-feign-candy</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-slime</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/SweetMathUtil.java

@@ -58,7 +58,7 @@ public class SweetMathUtil {
 //        getIndex("sweet:user:applet:unionid:oSpYSs1NH3glVRvVLNmUKqyjxKng");
 //        getIndex("sweet:user:applet:mobile:17638582147");
         // basicServices
-//        getIndex("basicServices:upushList:IOS");
+        getIndex("kylin:order:refund:address");
 //        getIndex("basicServices:upushList:Android");
 
 //        getIndex("basicServices:zhengzaiAppVersionsAndroid");

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -3,9 +3,12 @@ package com.liquidnet.service.sweet.utils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.constant.SlimeRedisConst;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -19,7 +22,6 @@ import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.param.SweetCityVoteParam;
 import com.liquidnet.service.sweet.vo.*;
-import jodd.util.ArraysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -51,8 +53,8 @@ public class RedisDataUtils {
     private SweetManualShopMapper sweetManualShopMapper;
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
-
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
     public List<SweetManualAppletDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_PUSH_LIST;
         List<SweetManualAppletDto> data = sweetManualMapper.getManualAppletDto();
@@ -60,10 +62,19 @@ public class RedisDataUtils {
             if (!item.getIsMember().equals(1)) {
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(), "yyyy-MM-dd HH:mm:ss"), item.getPayCountdownMinute()), DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java

@@ -6,7 +6,8 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.entity.*;
@@ -40,7 +41,8 @@ public class RedisMDSKDataUtils {
     private SweetManualShopMdskMapper sweetManualShopMdskMapper;
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletMDSKDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MDSK_MANUAL_PUSH_LIST;
@@ -49,10 +51,19 @@ public class RedisMDSKDataUtils {
             if(!item.getIsMember().equals(1)){
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(),"yyyy-MM-dd HH:mm:ss"),-item.getPayCountdownMinute()),DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisTFCDataUtils.java

@@ -6,12 +6,10 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.dto.SweetManualAppletTFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistList2TFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListTFCDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListTFCDto;
+import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.entity.SweetManualNotifyTfc;
 import com.liquidnet.service.sweet.entity.SweetManualShopTfc;
 import com.liquidnet.service.sweet.entity.SweetManualSortTfc;
@@ -44,7 +42,8 @@ public class RedisTFCDataUtils {
     private SweetManualNotifyTfcMapper sweetManualNotifyTFCMapper;
     @Autowired
     private SweetManualShopTfcMapper sweetManualShopTFCMapper;
-
+    @Autowired
+    private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletTFCDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_TFC_MANUAL_PUSH_LIST;
@@ -53,10 +52,19 @@ public class RedisTFCDataUtils {
             if(!item.getIsMember().equals(1)){
                 item.setTimeSell(DateUtil.format(DateUtil.addMin(DateUtil.parse(item.getTimeSell(),"yyyy-MM-dd HH:mm:ss"),-item.getPayCountdownMinute()),DateUtil.Formatter.yyyyMMddHHmmss));
             }
-            item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
+           /* item.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "name"));
             item.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "latitude"));
-            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));
+            item.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + item.getFieldId(), "longitude"));*/
+            SlimeFieldsDetailsVo slimeFieldsDetailsVo = feignSlimeApiClient.fieldDetails(item.getFieldId()).getData();
+            String fieldName = slimeFieldsDetailsVo.getName();
+            String cityName = slimeFieldsDetailsVo.getCityName();
+            String latitude = slimeFieldsDetailsVo.getLatitude();
+            String longitude = slimeFieldsDetailsVo.getLongitude();
+            item.setFieldName(fieldName);
+            item.setCityName(cityName);
+            item.setLatitude(latitude);
+            item.setLongitude(longitude);
         }
         redisUtil.set(redisKey, data);
         return data;