修改 第三方演出列表

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -88,10 +88,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Override
     public void test() {
 //        //同步演出
-//        String performancesId = "324470932321198083852669";
-//        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
-//        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
-//        merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, "484418569471385607065926", "528301618682265605017366", "528268445384048648038465");
+        String performancesId = "324470932321198083852669";
+        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+        merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, "484418569471385607065926", "528301618682265605017366", "528268445384048648038465");
 //        innerService.reportP(dataUtils.getPerformanceVo(performancesId),null,data.getSponsorId());
 //        //同步订单
 //        String orderId = "324561214127595525805856";

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -755,13 +755,21 @@ public final class RedisUtil {
 
     public static void main(String[] args) {
         String[] keys = {
-                "kylin:performances_inventory:ticket:id:523896782185635848726990:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:524000822137774085466119:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:524002587560632325278111:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:523899402439352329963230:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:523902717293568002992006:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:523900958747729925162437:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:523904302866309125382325:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:530885109799526402280996:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531325069586063361077629:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531353503781150727329219:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531349041081999366666149:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531364168218501127058552:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531343372617850889210970:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531361117112360960735313:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531328816065863686149183:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531355494691430403704035:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531330738650931204381245:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:531357532210667520852379:surplusGeneral",
+
+
+
+                "adam:info:certification_junk:1654123200303070024"
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java

@@ -3,9 +3,11 @@ package com.liquidnet.service.kylin.dao;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 @Data
-public class PerformancePartnerListDao {
+public class PerformancePartnerListDao implements Cloneable {
 
     //演出数据
     private String performancesId;
@@ -26,6 +28,16 @@ public class PerformancePartnerListDao {
     private String timeStop;
     private Integer payCountdownMinute;
     private Integer auditStatus;
+    private List<String> permissionId;
     private String rejectTxt;
     private String createdAt;
+
+    private static final PerformancePartnerListDao obj = new PerformancePartnerListDao();
+    public static PerformancePartnerListDao getNew() {
+        try {
+            return (PerformancePartnerListDao) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PerformancePartnerListDao();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -56,8 +56,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
-
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-merchant-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -14,6 +14,8 @@ import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import com.liquidnet.service.merchant.constant.MerchantRedisConst;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -54,6 +56,17 @@ public class DataUtils {
         return JsonUtils.toJson(data);
     }
 
+    //获取场地redis
+    public MerchantFieldsVo getFieldVo(String fieldId) {
+        String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
+        MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
+            redisUtil.set(key, vo);
+        }
+        return vo;
+    }
+
     /**
      * 初始化普通库存
      *

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/MongoVoUtils.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -39,8 +40,6 @@ public class MongoVoUtils {
     @Autowired
     private KylinTicketRelationsMapper ticketRelationsMapper;
     @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
     private DataUtils dataUtils;
 
     public KylinPerformanceVo combinePerformanceVoData(String performancesId) {
@@ -53,12 +52,13 @@ public class MongoVoUtils {
             KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
             //场地相关数据
             KylinFields fields = new KylinFields();
-            String cityName = (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
-            fields.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
-            fields.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
-            fields.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
-            fields.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
-            fields.setName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
+
+            MerchantFieldsVo fieldsVo = dataUtils.getFieldVo(p3.getFieldId());
+            fields.setCityId(Integer.parseInt(fieldsVo.getCityId()));
+            fields.setLatitude(fieldsVo.getLatitude());
+            fields.setLongitude(fieldsVo.getLongitude());
+            fields.setCityName(fieldsVo.getCityName());
+            fields.setName(fieldsVo.getName());
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;
@@ -156,7 +156,7 @@ public class MongoVoUtils {
             voData.setPerformance(p1);
             voData.setPerformanceStatus(p2);
             voData.setPerformanceRelations(p3);
-            voData.setFieldsData(fields, cityName);
+            voData.setFieldsData(fields, fieldsVo.getCityName());
             if (stopSellTime == null) {
                 stopSellTime = DateUtil.Formatter.yyyyMMddHHmmss.parse("2030-12-01 12:00:00");
             }