Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserPerformancesMapper.xml

@@ -34,17 +34,18 @@
     <!-- 第三方 验票员未配置 演出 -->
     <select id="unChildPerformanceList" parameterType="java.util.Map" resultMap="childPerformanceDaoResult">
         SELECT p.performances_id,
-               p.title,
-               p.time_start,
-               p.time_end
+        p.title,
+        p.time_start,
+        p.time_end
+        DATE_SUB(p.time_start,INTERVAL -3 DAY) as 'can_dwon_time'
         FROM kylin_performances AS p
-                 LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
+        LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE p.performances_id NOT IN (
-            SELECT performance_id
-            FROM kylin_check_user_performances
-            WHERE check_user_id = #{checkUserId}
+        SELECT performance_id
+        FROM kylin_check_user_performances
+        WHERE check_user_id = #{checkUserId}
         )
-          AND pr.merchant_id = #{merchantId}
+        AND pr.merchant_id = #{merchantId}
         <if test="name!=''">
             AND title LIKE concat('%', #{name}, '%')
         </if>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

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

@@ -117,6 +117,10 @@ public class MongoVoUtils {
                         if (kylinTicketVo.getIsExclusive() == 1) {
                             isExclusive = 1;
                         }
+
+                        if (isAdvance == 0 && isDiscount == 0 && isExclusive == 0) {
+                            isMember = 0;
+                        }
                     }
                     if (kylinTicketVo.getIsLackRegister() == 1) {
                         isLackRegister = 1;
@@ -141,12 +145,12 @@ public class MongoVoUtils {
                 }
 
 //                if(ticketList.size()>0) {
-                    KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
-                    kylinTicketTimesVo.setTicketTimes(tt1);
-                    kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
-                    kylinTicketTimesVo.setTimeId(times.getTimesId());
-                    kylinTicketTimesVo.setTicketList(ticketList);
-                    timeList.add(kylinTicketTimesVo);
+                KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
+                kylinTicketTimesVo.setTicketTimes(tt1);
+                kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
+                kylinTicketTimesVo.setTimeId(times.getTimesId());
+                kylinTicketTimesVo.setTicketList(ticketList);
+                timeList.add(kylinTicketTimesVo);
 //                }
             }
 
@@ -154,7 +158,7 @@ public class MongoVoUtils {
             voData.setPerformanceStatus(p2);
             voData.setPerformanceRelations(p3);
             voData.setFieldsData(fields, cityName);
-            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellMemberTime,sellTime, isAdvance, isDiscount, payCountdownMinute);
+            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellMemberTime, sellTime, isAdvance, isDiscount, payCountdownMinute);
             voData.setTicketTimeList(timeList);
             voData.setAppStatus(p2.getStatus());
             return voData;
@@ -181,7 +185,7 @@ public class MongoVoUtils {
         }
         BeanUtils.copyProperties(data, voItem);
         List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
-        if(type == 1) {
+        if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {
                 if (redisData.get(0).getOrderTicketsId().equals(orderId)) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ liquidnet:
     path: /data/logs
     name: support-config
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
   rabbitmq:
     host: 127.0.0.1
     port: 5672

liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring: