Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -4,7 +4,7 @@ public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
     public static final String PERFORMANCES = "kylin:performances:id:";
     public static final String PERFORMANCES_LIST_CITYNAME = "kylin:performances:cityName:";
-    public static final String PERFORMANCES_LIST_ALL = "kylin:performances:cityName.*";
+    public static final String PERFORMANCES_LIST_ALL = "kylin:performances:cityName*";
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
     public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9001
-    context:
+    context: /adam
     name: liquidnet-service-adam
   logfile:
     path: ./logs

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9002
-    context:
+    context: /kylin
     name: liquidnet-service-kylin
   logfile:
     path: ./logs
@@ -25,6 +25,6 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
-    localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
+    localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
   url-service:
     url: http://testservice.zhengzai.tv/

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -25,6 +25,6 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
-    localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
+    localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
   url-service:
     url: http://testservice.zhengzai.tv/

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketEntities.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -96,6 +97,11 @@ public class KylinOrderTicketEntities implements Serializable {
      */
     private Integer isPayment;
 
+    /**
+     * 已退款金额
+     */
+    private BigDecimal refundPrice;
+
     /**
      * comment
      */

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

@@ -299,6 +299,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Document queryObject = new Document();
         queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
         Query query = new BasicQuery(queryObject);
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         long count = mongoTemplate.count(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());