Merge branch 'dev_merchant' into dev_merchant_tice

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/docu/db_merchant.sql

@@ -253,3 +253,6 @@ create index permission_id_index on merchant_authorization_permissions (permissi
 -- >>------------------------------------------------------------------------------------
 -- >>------------------------------------------------------------------------------------
 -- >>------------------------------------------------------------------------------------
+
+alter table kylin_ticket_status modify qr_code_show_time datetime default '2030-01-01 12:00:00' null comment '二维码显示时间';
+alter table kylin_tickets modify time_end_express datetime default '2030-01-01 12:00:00' null comment '快递票结束时间';

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

@@ -354,7 +354,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 ticketPartnerVo.setTicketsId(ticketsId);
                 ticketPartnerVo.setStatus(9);
                 mongoMerchantUtils.updateTicketPartnerVo(ticketPartnerVo);
-                performanceUtils.performanceVoStatus(performancesId);
+                performanceUtils.performanceVoStatus(performancesId,null);
                 log.info(UserPathDto.setPartnerData("0", "onLine", "performancesId=" + performancesId + ",ticketsId=" + ticketsId, "上线成功"));
                 return ResponseDto.success("上线成功");
             } else {
@@ -397,7 +397,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 ticketPartnerVo.setTicketsId(ticketsId);
                 ticketPartnerVo.setStatus(7);
                 mongoMerchantUtils.updateTicketPartnerVo(ticketPartnerVo);
-                performanceUtils.performanceVoStatus(performancesId);
+                performanceUtils.performanceVoStatus(performancesId,null);
                 log.info(UserPathDto.setPartnerData("0", "outLine", "performancesId=" + performancesId + ",ticketsId=" + ticketsId, "下线成功"));
                 return ResponseDto.success("下线成功");
             } else {

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

@@ -35,6 +35,8 @@ public class MongoMerchantUtils {
     private MongoTemplate mongoTemplate;
     @Autowired
     private MongoConverter mongoConverter;
+    @Autowired
+    private RedisMerchantUtils redisMerchantUtils;
 
 
     public PerformancePartnerVo getPerformancePartnerVo(String performanceId,String merchantId) {
@@ -175,15 +177,8 @@ public class MongoMerchantUtils {
         return mongoTemplate.insert(data, KylinPerformanceVo.class.getSimpleName());
     }
 
-    public void updatePerformanceVo(HashMap<String, Object> map, String performanceId) {
-        BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-        mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
-                objectTicketVo
-        );
-    }
-
     public Object delPerformanceVo(String performanceId) {
+        redisMerchantUtils.delPerformanceVo(performanceId);
         return mongoTemplate.remove(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
     }
 

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

@@ -55,7 +55,7 @@ public class PerformanceUtils {
      *
      * @param performanceSingleId
      */
-    public void performanceVoStatus(String performanceSingleId) {
+    public void performanceVoStatus(String performanceSingleId,Integer voStatus) {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("kylin_ticket_status.VoStatus"));
         sqls.add(SqlMapping.get("kylin_performance_status.VoStatus"));
@@ -74,6 +74,9 @@ public class PerformanceUtils {
 
         for (String performancesId : performanceIdList) {
             KylinPerformanceVo vo = combinePerformanceVoData(performancesId);
+            if(voStatus!=null){
+                vo.setAppStatus(voStatus);
+            }
             //场次
             List<KylinTicketTimesVo> timesData = vo.getTicketTimeList();
             if (timesData.size() == 0) {

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

@@ -52,17 +52,27 @@ public class RedisMerchantUtils {
      * @param performanceId
      * @return
      */
-    public KylinPerformanceVo getPerformanceVo(String performanceId,String merchantId) {
+    public KylinPerformanceVo getPerformanceVo(String performanceId, String merchantId) {
         Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
         if (obj != null) {
             return (KylinPerformanceVo) obj;
         } else {
-            KylinPerformanceVo performanceData = mongoMerchantUtils.getPerformanceVo(performanceId,merchantId);
+            KylinPerformanceVo performanceData = mongoMerchantUtils.getPerformanceVo(performanceId, merchantId);
             redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
             return performanceData;
         }
     }
 
+    /**
+     * 根据演出id 删除 演出vo 详情
+     *
+     * @param performanceId
+     * @return
+     */
+    public void delPerformanceVo(String performanceId) {
+        redisUtil.del(KylinRedisConst.PERFORMANCES+performanceId);
+    }
+
     public KylinPerformanceVo getPerformanceVoNoMerchant(String performanceId) {
         Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
         if (obj != null) {

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties

@@ -26,8 +26,8 @@ kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at
 #  ----    演出第二步骤操作    ----
 kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_ticket.updateStep2=UPDATE kylin_tickets SET time_end = ? , time_start = ? ,time_end_express = ? ,pay_countdown_minute = ? ,price = ? WHERE tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_ticket_status.updateStep2=UPDATE kylin_ticket_status SET total_exchange = ? , total_general = ? , is_true_name = ? , limit_count = ? , is_lack_register = ? , is_express = ? , is_electronic = ? ,counts = ? , is_show_code = ? ,qr_code_show_time = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #  ----    VoStatus    ----
 kylin_ticket_status.VoStatus=UPDATE kylin_ticket_status SET status = ?, surplus_general = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_performance_status.VoStatus=UPDATE kylin_performance_status SET status = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)