Merge branch 'dev-1.3' into dev-1.3-container

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -21,7 +21,7 @@ import java.util.List;
 @ApiModel
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class KylinPerformanceVo implements Serializable, Cloneable {
+public class  KylinPerformanceVo implements Serializable, Cloneable {
 
     private Integer mid;
     @ApiModelProperty(value = "主键")
@@ -146,6 +146,9 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "开票提醒 0为不提醒", example = "0")
     private Integer isInvoiceReminder;
 
+    @ApiModelProperty(value = "场地地址")
+    private String fieldAddress;
+
     public Integer getIdCount() {
         return idCount == null ? limitCount : idCount;
     }

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

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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -315,6 +315,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             performancesInfo.setIsVip(dataUtils.isMemberByUser(uid));
         }
         performancesInfo.setIsInvoiceReminder(dataUtils.getPerformanceInvoiceReminder(performancesId));
+        performancesInfo.setFieldAddress(dataUtils.getFieldAddressByFieldId(performancesInfo.getFieldId()));
         return performancesInfo;
     }
 
@@ -639,11 +640,19 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             }
             List<KylinTicketTimesVo> ticketTimeList = info.getTicketTimeList();
             List<KylinTicketTimesVo> ticketTimeListNew = ObjectUtil.getKylinTicketTimesVoArrayList();
+            // 票种售罄数量
+            int ticketSoldOutTotal = 0;
+            // 票种总数量
+            int ticketTotal = 0;
             for (KylinTicketTimesVo ticketTime : ticketTimeList) {
                 List<KylinTicketVo> ticketList = ticketTime.getTicketList();
                 List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
                 for (KylinTicketVo ticket : ticketList) {
+                    ticketTotal++;
                     int status = checkTicketStatus(ticket);
+                    if (status == 8) {
+                        ticketSoldOutTotal++;
+                    }
                     ticket.setStatus(status);
                     // 会员状态
                     Integer isMemberStatus = getIsMemberStatus(ticket);
@@ -662,6 +671,12 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             if (CollectionUtils.isEmpty(ticketTimeListNew) && 7 != info.getAppStatus()) { //列表的时候无需判断 因为列表不展示状态标签
                 info.setAppStatus(11); // 所有票种下架 演出停售
             }
+
+            if (ticketSoldOutTotal == ticketTotal) {
+                // 所有票售罄
+                info.setAppStatus(8);
+            }
+
             // 当前时间大于停售时间 小于结束时间 是 停售
             String nowTimeStr = DateUtil.getNowTime();
             String stopSellTime = info.getStopSellTime();
@@ -706,6 +721,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             status = 8;
             getStatus = 8;
         }
+        if (1 == DateUtil.compareStrDay(ticketItem.getTimeStart(), DateUtil.getNowTime())) {// 未开始
+            getStatus = 9;
+        }
         if (null != ticketItem) {
             // 判断售罄
             if (6 == getStatus || 9 == getStatus || 10 == getStatus) {

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

@@ -32,6 +32,8 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinLuckyBagActivityMapper;
 import com.liquidnet.service.kylin.mapper.KylinLuckyBagMapper;
 import com.liquidnet.service.kylin.mapper.KylinRewardUserMapper;
+import com.liquidnet.service.slime.constant.SlimeRedisConst;
+import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -1613,6 +1615,20 @@ public class DataUtils {
                 KylinTicketPartnerVo.class.getSimpleName());
     }
 
+    public String getFieldAddressByFieldId(String fieldId){
+        String key = SlimeRedisConst.INFO_FIELD.concat(fieldId);
+        SlimeFieldsVo vo = (SlimeFieldsVo) redisUtil.get(key);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), SlimeFieldsVo.class, SlimeFieldsVo.class.getSimpleName());
+            redisUtil.set(SlimeRedisConst.INFO_FIELD.concat(fieldId), vo);
+        }
+        if (null == vo) {
+            log.error("[getFieldAddressByFieldId] 场地信息为空, fieldId: {}", fieldId);
+            return "";
+        }
+        return vo.getAddress();
+    }
+
 
     /**
      * 获取福袋活动列表