票 vo 增加 会员开售时间 正常开售时间

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

@@ -43,6 +43,8 @@ public class KylinPerformanceVo {
     private String price;
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
+    @ApiModelProperty(value = "会员开售时间")
+    private String sellMemberTime;
     @ApiModelProperty(value = "城市id")
     private Integer cityId;
     @ApiModelProperty(value = "城市名称")
@@ -115,12 +117,13 @@ public class KylinPerformanceVo {
         this.approvalUrl=performance.getApprovalUrl();
     }
 
-    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) {
+    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime,LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) {
         this.isLackRegister = isLackRegister;
         this.isMember = isMember;
         this.isExclusive = isExclusive;
         this.price = price + "起";
         this.stopSellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(stopSellTime);
+        this.sellMemberTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellMemberTime);
         this.sellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellTime);
         this.appStatus = 9;
         this.isDiscount = isDiscount;

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

@@ -62,6 +62,7 @@ public class MongoVoUtils {
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;
+            LocalDateTime sellMemberTime = null;
             LocalDateTime sellTime = null;
             int isLackRegister = 0;
             int isMember = 0;
@@ -125,8 +126,11 @@ public class MongoVoUtils {
                     if (stopSellTime == null || stopSellTime.isBefore(t1.getTimeEnd())) {
                         stopSellTime = t1.getTimeEnd();
                     }
-                    if (sellTime == null || sellTime.isAfter(t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember()))) {
-                        sellTime = t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember());
+                    if (sellMemberTime == null || sellMemberTime.isAfter(t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember()))) {
+                        sellMemberTime = t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember());
+                    }
+                    if (sellTime == null || sellTime.isAfter(t1.getTimeStart())) {
+                        sellTime = t1.getTimeStart();
                     }
                 }
 
@@ -142,7 +146,7 @@ public class MongoVoUtils {
             voData.setPerformanceStatus(p2);
             voData.setPerformanceRelations(p3);
             voData.setFieldsData(fields, cityName);
-            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, 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;

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

@@ -64,6 +64,8 @@ public class MongoVoUtils {
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;
             LocalDateTime sellTime = null;
+            LocalDateTime sellMemberTime = null;
+
             int isLackRegister = 0;
             int isMember = 0;
             int isExclusive = 0;
@@ -127,8 +129,11 @@ public class MongoVoUtils {
                     if (stopSellTime == null || stopSellTime.isBefore(t1.getTimeEnd())) {
                         stopSellTime = t1.getTimeEnd();
                     }
-                    if (sellTime == null || sellTime.isAfter(t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember()))) {
-                        sellTime = t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember());
+                    if (sellMemberTime == null || sellMemberTime.isAfter(t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember()))) {
+                        sellMemberTime = t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember());
+                    }
+                    if (sellTime == null || sellTime.isAfter(t1.getTimeStart())) {
+                        sellTime = t1.getTimeStart();
                     }
                 }
 
@@ -144,7 +149,7 @@ public class MongoVoUtils {
             voData.setPerformanceStatus(p2);
             voData.setPerformanceRelations(p3);
             voData.setFieldsData(fields, cityName);
-            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, 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;