修改 bug

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/util/MemberUtil.java

@@ -40,7 +40,7 @@ public class MemberUtil {
         String microTime = String.valueOf(calendar.getTimeInMillis() * 1000).substring(2, 5);
         String  sign = word.concat(month).concat(day).concat(time).concat(microTime);
         sign =  String.format(sign + "%02d", rand.nextInt(99));
-        sign = MD5.getStrMD5(sign);
+        sign = MD5.getStrMD5(sign,null);
 
         String s = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/KylinTicketIgnoreVo.java

 package com.liquidnet.service.kylin.dto.vo.ignore;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,12 +82,12 @@ public class KylinTicketIgnoreVo {
         this.describes = ticket.getDescribes();
         this.describeExpress = ticket.getDescribeExpress();
         this.describeElectronic = ticket.getDescribeElectronic();
-        this.timeStart = ticket.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.timeEnd = ticket.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.memberTimeStart = ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.timeEndExpress = ticket.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.useStart = ticket.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.useEnd = ticket.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart());
+        this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEnd());
+        this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()));
+        this.timeEndExpress = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEndExpress());
+        this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseStart());
+        this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseEnd());
         this.saleRemindMinute = ticket.getSaleRemindMinute();
     }
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/KylinTicketTimesIgnoreVo.java

 package com.liquidnet.service.kylin.dto.vo.ignore;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,7 +32,7 @@ public class KylinTicketTimesIgnoreVo {
         this.ticketTimesId=ticketTimes.getTicketTimesId();
         this.title=ticketTimes.getTitle();
         this.type=ticketTimes.getType();
-        this.useStart=ticketTimes.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.useEnd=ticketTimes.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.useStart= DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
+        this.useEnd=DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
     }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketTimesVo.java

 package com.liquidnet.service.kylin.dto.vo.middle;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +35,7 @@ public class KylinTicketTimesVo {
         this.ticketTimesId=ticketTimes.getTicketTimesId();
         this.title=ticketTimes.getTitle();
         this.type=ticketTimes.getType();
-        this.useStart=ticketTimes.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.useEnd=ticketTimes.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.useStart= DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseStart());
+        this.useEnd=DateUtil.Formatter.yyyyMMddHHmmss.format(ticketTimes.getUseEnd());
     }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinTicketVo.java

 package com.liquidnet.service.kylin.dto.vo.middle;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 import io.swagger.annotations.ApiModel;
@@ -100,17 +101,17 @@ public class KylinTicketVo {
         this.describes = ticket.getDescribes();
         this.describeExpress = ticket.getDescribeExpress();
         this.describeElectronic = ticket.getDescribeElectronic();
-        this.timeStart = ticket.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.timeEnd = ticket.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart());
+        this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEnd());
         this.advanceMinuteMember = ticket.getAdvanceMinuteMember();
-        this.memberTimeStart = ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.memberTimeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeStart().plusMinutes(-ticket.getAdvanceMinuteMember()));
         if (ticket.getTimeEndExpress() != null) {
-            this.timeEndExpress = ticket.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            this.timeEndExpress = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getTimeEndExpress());
         } else {
             this.timeEndExpress = null;
         }
-        this.useStart = ticket.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.useEnd = ticket.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.useStart = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseStart());
+        this.useEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(ticket.getUseEnd());
         this.saleRemindMinute = ticket.getSaleRemindMinute();
     }
 
@@ -131,7 +132,7 @@ public class KylinTicketVo {
         this.counts = ticketStatus.getCounts();
         this.sysDamai = ticketStatus.getSyncDamai();
         this.isShowCode = ticketStatus.getIsShowCode();
-        this.qrCodeShowTime = ticketStatus.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.qrCodeShowTime = DateUtil.Formatter.yyyyMMddHHmmss.format(ticketStatus.getQrCodeShowTime());
 
     }
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/message/MessageConfigVo.java

+package com.liquidnet.service.kylin.dto.vo.middle.message;
+
+import lombok.Data;
+
+@Data
+public class MessageConfigVo {
+    private Boolean status;
+    private String id;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/message/MessageDataVo.java

+package com.liquidnet.service.kylin.dto.vo.middle.message;
+
+import lombok.Data;
+
+@Data
+public class MessageDataVo {
+    private String name;
+    private String time;
+}

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

 package com.liquidnet.service.kylin.dto.vo.mongo;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
@@ -103,8 +104,8 @@ public class KylinPerformanceVo {
         this.performancesId = performance.getPerformancesId();
         this.title = performance.getTitle();
         this.imgPoster = performance.getImgPoster();
-        this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeStart());
+        this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeEnd());
         this.type = performance.getType();
         this.details =performance.getDetails();
         this.noticeImage = performance.getNoticeImage();
@@ -115,8 +116,8 @@ public class KylinPerformanceVo {
         this.isMember = isMember;
         this.isExclusive = isExclusive;
         this.price = price + "起";
-        this.stopSellTime = stopSellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        this.sellTime = sellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.stopSellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(stopSellTime);
+        this.sellTime = DateUtil.Formatter.yyyyMMddHHmmss.format(sellTime);
         this.appStatus = 9;
         this.isDiscount = isDiscount;
         this.isAdvance = isAdvance;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.enums.BannersTargetType;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -70,7 +71,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             // 时间
             String bannersId = IDGenerator.nextSnowId().toString();
             LocalDateTime createdAt = LocalDateTime.now();
-            String createdAtString = createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            String createdAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt);
             if (StringUtils.isEmpty(bannersParam.getOnlineStartTime())) {
                 bannersParam.setOnlineStartTime(null);
             }
@@ -143,7 +144,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             // 时间
             String bannersId = bannersParam.getBannersId();
             LocalDateTime updatedAt = LocalDateTime.now();
-            String updatedAtString = updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            String updatedAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(updatedAt);
 
             KylinBanners params = bannersParam.getFields(null, null);
             params.setUpdatedAt(updatedAtString);
@@ -258,7 +259,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     public Boolean delete(List<String> bannersId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
-            String updatedAtString = updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            String updatedAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(updatedAt);
 
             KylinBanners kylinBanners = new KylinBanners();
             kylinBanners.setUpdatedAt(updatedAtString);

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/MD5.java

@@ -4,13 +4,16 @@
  */
 package com.liquidnet.commons.lang.util;
 
+import java.io.UnsupportedEncodingException;
+
 /**
- *
  * @author <a href="mailto:yupengfei@kowlone.com">kowlone</a>
  * @version 1.0 2015年10月27日 上午10:09:02
  */
 public class MD5 {
-	/** S11-S44为4*4的矩阵,只读,在且能在同一个进程空间内的多个Instance间共享 */
+    /**
+     * S11-S44为4*4的矩阵,只读,在且能在同一个进程空间内的多个Instance间共享
+     */
     static final int S11 = 7;
 
     static final int S12 = 12;
@@ -43,9 +46,9 @@ public class MD5 {
 
     static final int S44 = 21;
 
-	static final byte[] PADDING = { -128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    static final byte[] PADDING = {-128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0 };
+            0};
 
     /*
      * 下面的三个成员是MD5计算过程中用到的3个核心数据，在原始的C实现中 被定义到MD5_CTX结构中
@@ -70,13 +73,16 @@ public class MD5 {
     /**
      * 类MD5最主要的公共方法,变换完的结果从公共成员digestHexStr取得的．
      *
-	 * @param inbuf
-	 *            进行MD5变换的字符串
+     * @param inbuf 进行MD5变换的字符串
      * @return String 变换完的结果
      */
-	public String getMD5ofStr(String inbuf) {
+    public String getMD5ofStr(String inbuf, String charsetStr) throws UnsupportedEncodingException {
         md5Init();
+        if (null == charsetStr) {
             md5Update(inbuf.getBytes(), inbuf.length());
+        } else {
+            md5Update(inbuf.getBytes(charsetStr), inbuf.length());
+        }
         md5Final();
         digestHexStr = "";
         for (int i = 0; i < 16; i++) {
@@ -92,12 +98,16 @@ public class MD5 {
     /**
      * 得到字符串的MD5结果
      *
-	 * @param str
-	 *            进行MD5变换的字符串
+     * @param str 进行MD5变换的字符串
      * @return String 变换完的结果
      */
-	public static String getStrMD5(String str) {
-		return SingletonHolder.instance.getMD5ofStr(str);
+    public static String getStrMD5(String str, String charsetStr) {
+        try {
+            return SingletonHolder.instance.getMD5ofStr(str, charsetStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
     }
 
     // 这是MD5这个类的标准构造函数，JavaBean要求有一个public的并且没有参数的构造函数
@@ -360,7 +370,7 @@ public class MD5 {
     public static String byteHEX(byte ib) {
         // char[] Digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
         // 'A', 'B', 'C', 'D', 'E', 'F' };
-		char[] Digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+        char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
         char[] ob = new char[2];
         ob[0] = Digit[(ib >>> 4) & 0X0F];
         ob[1] = Digit[ib & 0X0F];

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

@@ -4,7 +4,10 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
+import com.liquidnet.service.kylin.utils.OtherUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -23,6 +26,8 @@ import java.util.Map;
 @Validated
 public class PerformancePartnerController {
 
+    @Autowired
+    private OtherUtils otherUtils;
     @Autowired
     private KylinPerformancesPartnerServiceImpl performancesPartnerService;
 

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
@@ -39,7 +40,7 @@ public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBan
         );
 
         LocalDateTime nowTime = LocalDateTime.now();
-        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         Criteria onlineTimeBetween = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").gte(nowTimeStr);
         Criteria onlineTimeGt = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").is("");
         Criteria onlineTimeLt = Criteria.where("onlineStartTime").is("").and("onlineEndTime").gte(nowTimeStr);

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

@@ -38,9 +38,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -640,7 +637,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         RLock lock = RedisLockUtil.lock("order_lock:" + syncOrderParam.getOrder_code(), 240);
 
 
-        String timePay = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String timePay = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
         KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrder_code())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
         if (orderTicketData == null) {
             lock.unlock();

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

@@ -111,7 +111,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         // 固定查询条件
         LocalDateTime nowTime = LocalDateTime.now();
-        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         // 查询总数
@@ -166,7 +166,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 固定条件
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
-        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         // 今天的
@@ -182,7 +182,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 三天的
         Query queryT = new Query();
         LocalDateTime nowTimeT = LocalDateTime.now();
-        String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStrT = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTimeT);
         queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
 
         LocalDateTime threeDaysLater = toDayTime.plusDays(3);
@@ -202,7 +202,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 固定条件
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
-        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         query.fields().exclude("details");
@@ -219,7 +219,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 固定条件
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
-        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         query.fields().exclude("details");

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

@@ -229,7 +229,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
                 result = createStep2(step2Param);
                 log.info(" PERFORMANCE  演出第二步 创建(拒绝/撤回/第一次)");
-            } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7) {// 修改
+            } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7|| performanceStatus.getStatus() == 8|| performanceStatus.getStatus() == 9) {// 修改
                 result = updateStep2(step2Param);
                 log.info(" PERFORMANCE  演出第二步 修改");
             }

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ErrorMapping;
@@ -107,8 +108,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo();
             BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo);
             kylinTicketPartnerVo.setTicketsId(ticketsId);
-            kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            kylinTicketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            kylinTicketPartnerVo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt));
+            kylinTicketPartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(ticketCreateParam.getTimeStart()));
             kylinTicketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 
             KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());

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

+package com.liquidnet.service.kylin.utils;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.MD5;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.security.MessageDigest;
+import java.time.LocalDateTime;
+
+@Service
+@Slf4j
+public class OtherUtils {
+
+    @Value("${liquidnet.url-service.url}")
+    private String serviceUrl;
+
+    //发短信
+    public boolean sendMessage(String mobile, MessageDataVo data, MessageConfigVo configVo, Integer sign_id) {
+        try {
+            if (null != configVo && null != configVo.getStatus() && configVo.getStatus()) {
+                LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<>();
+                httpData.add("mobile", mobile);
+                httpData.add("templateId", configVo.getId());
+                httpData.add("signId", sign_id.toString());
+                httpData.add("data", JsonUtils.toJson(data));
+                String sign = Ksort(httpData);
+                sign = sign.concat("&key=").concat("R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V");
+                sign = sign.toUpperCase();
+                httpData.add("sign", sign);
+
+                String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
+                JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
+                if (postResultNew.get("message").toString() != "OK") {
+                    return false;
+                } else {
+                    return true;
+                }
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public String Ksort(MultiValueMap<String, String> map) {
+        String sb = "";
+        String[] key = new String[map.size()];
+        int index = 0;
+        for (String k : map.keySet()) {
+            key[index] = k;
+            index++;
+        }
+        for (String s : key) {
+            sb += s + "=" + map.get(s).get(0) + "&";
+        }
+        sb = sb.substring(0, sb.length() - 1);
+        // 将得到的字符串进行处理得到目标格式的字符串
+        try {
+            sb = URLDecoder.decode(sb, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }// 使用常见的UTF-8编码
+        sb = sb.replace("%3D", "=").replace("%26", "&");
+        return sb;
+    }
+
+    public static String md5s(String txt) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(txt.getBytes("GBK"));    //问题主要出在这里，Java的字符串是unicode编码，不受源码文件的编码影响；而PHP的编码是和源码文件的编码一致，受源码编码影响。
+            StringBuilder buf = new StringBuilder();
+            for (byte b : md.digest()) {
+                buf.append(String.format("%02x", b & 0xff));
+            }
+            return buf.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}