提交admin审核相关

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.DateUtils;
+import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -11,6 +12,7 @@ import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.other.DamaiService;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.internal.util.StringUtils;
 import com.taobao.api.request.*;
@@ -59,6 +61,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     @Autowired
     private KylinTicketStatusMapper ticketStatusMapper;
     @Autowired
+    private DataUtils dataUtils;
+    @Autowired
     private RedisUtil redisUtil;
 
     @Override
@@ -133,9 +137,10 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 //            } else {
 //                return 0L;
 //            }
-            obj1.setVenueId(Long.parseLong(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "id").toString()));
-            obj1.setVenueName(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "name").toString());
-            obj1.setVenueAddress(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "address").toString());
+            MerchantFieldsVo fieldsVo =  dataUtils.getFieldsVoByFieldId(fieldId);
+            obj1.setVenueId(Long.parseLong(fieldsVo.getFieldId()));
+            obj1.setVenueName(fieldsVo.getName());
+            obj1.setVenueAddress(fieldsVo.getAddress());
 
             req.setPushVenueParam(obj1);
             AlibabaDamaiMevOpenPushvenueResponse rsp = client.execute(req);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -11,6 +11,8 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+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.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -43,6 +45,18 @@ public class DataUtils {
         redisUtil.set(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, totalGeneral);
     }
 
+    // 【场地】获取详情
+    public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
+        String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
+        long s = System.currentTimeMillis();
+        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(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
+        }
+        return vo;
+    }
+
     /**
      * 获取普通剩余库存
      *

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/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;
@@ -53,12 +54,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");
+            MerchantFieldsVo fieldsVo =  dataUtils.getFieldsVoByFieldId(p3.getFieldId());
+            String cityName =fieldsVo.getCityName();
             fields.setCityId(null);
-            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"));
+            fields.setLatitude(fieldsVo.getLatitude());
+            fields.setLongitude(fieldsVo.getLongitude());
+            fields.setCityName(cityName);
+            fields.setName(fieldsVo.getName());
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -19,6 +19,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -249,9 +250,11 @@ public class PerformanceVoUtils {
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
             BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
 
+            MerchantFieldsVo fieldsVo =  dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
             performances.setDetails(performanceUpdateMisVo.getDetails());
-            performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
-            performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
+            performances.setCityName(fieldsVo.getCityName());
+            performances.setCityId(Integer.parseInt(fieldsVo.getCityId()));
+
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeEnd())));

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

@@ -284,10 +284,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
             LocalDateTime now = LocalDateTime.now();
             // 获取 当前时间 -> 创建时间
-//            boolean isExistsSubmit = mongoMerchantUtils.isExistsSubmitPerformancePartner(performanceId, merchantId);
-//            if (isExistsSubmit) {
-//                return ResponseDto.failure(ErrorMapping.get(20112));
-//            }
+            boolean isExistsSubmit = mongoMerchantUtils.isExistsSubmitPerformancePartner(performanceId, merchantId);
+            if (isExistsSubmit) {
+                return ResponseDto.failure(ErrorMapping.get(20112));
+            }
             //演出修改数据
             PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
             performancePartnerVo.setPerformancesId(performanceId);