增加 修改 快递票 购票须知

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java

@@ -64,7 +64,7 @@ public class KylinTicketPartnerVo implements Serializable {
     private String describes;
 
     @ApiModelProperty(value = "快递票种说明", example = "这是票种说明")
-    private String describesExpress;
+    private String describeExpress;
 
     @ApiModelProperty(value = "电子票种说明", example = "这是票种说明")
     private String describeElectronic;

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

@@ -87,7 +87,7 @@ public class PerformanceVoUtils {
         List<String> performanceIdList = new ArrayList<>();
 
         if (performanceSingleId == null) {
-            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9));
+            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
             for (KylinPerformanceStatus item : list) {
                 performanceIdList.add(item.getPerformanceId());
             }
@@ -138,7 +138,7 @@ public class PerformanceVoUtils {
                         }
                     }
 
-                    if(kylinTicketVoItem.getStatus()==7){
+                    if (kylinTicketVoItem.getStatus() == 7) {
                         status = 7;
                     }
                     //修改票状态
@@ -165,20 +165,20 @@ public class PerformanceVoUtils {
                 }
             }
 
-            if(vo.getAppStatus()<=4){
-                appStatus=vo.getAppStatus();
+            if (vo.getAppStatus() <= 4) {
+                appStatus = vo.getAppStatus();
             }
-            if(vo.getAppStatus()==7){
-                appStatus=7;
+            if (vo.getAppStatus() == 7) {
+                appStatus = 7;
             }
 
             //修改演出状态
             KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
             changeStatus.setStatus(appStatus);
-            performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId));
+            performanceStatusMapper.update(changeStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
 
             vo.setAppStatus(appStatus);
-            dataUtils.updatePerformanceMongo(performancesId,vo);
+            dataUtils.updatePerformanceMongo(performancesId, vo);
         }
     }
 
@@ -220,7 +220,8 @@ public class PerformanceVoUtils {
 
         kylinPerformanceMisVo.setIsDistribution(0);
         kylinPerformanceMisVo.setSyncAgent(0);
-        kylinPerformanceMisVo.setNoticeImageList(JsonUtils.fromJson(kylinPerformanceMisVo.getNoticeImage(), new TypeReference<List<KylinBuyNoticeVo>>() {}));
+        kylinPerformanceMisVo.setNoticeImageList(JsonUtils.fromJson(kylinPerformanceMisVo.getNoticeImage(), new TypeReference<List<KylinBuyNoticeVo>>() {
+        }));
 
         return kylinPerformanceMisVo;
     }
@@ -259,6 +260,7 @@ public class PerformanceVoUtils {
             performanceStatus.setUpdatedAt(updatedAt);
 
             performanceRelations.setPerformanceId(performances.getPerformancesId());
+            performanceRelations.setRoadShowId(null);
             performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
             performanceRelations.setCreatedAt(null);
             performanceRelations.setUpdatedAt(updatedAt);
@@ -293,9 +295,9 @@ public class PerformanceVoUtils {
                     ticketTimesMapper.insert(ticketTimes);
                     ticketTimeRelationMapper.insert(ticketTimeRelation);
 
-                    HashMap<String ,Object> map2 = new HashMap<>();
-                    map2.put("status",1);
-                    map2.put("updatedAt",map.get("updatedAt"));
+                    HashMap<String, Object> map2 = new HashMap<>();
+                    map2.put("status", 1);
+                    map2.put("updatedAt", map.get("updatedAt"));
                     BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
                     mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("ticketTimesId").is(ticketTimeRelation.getTimesId())).getQueryObject(),
@@ -382,7 +384,6 @@ public class PerformanceVoUtils {
                         ticketStatus.setIsMember(null);
                         ticketRelations.setCreatedAt(null);
                         tickets.setCreatedAt(null);
-
                         ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId()));
                         ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", tickets.getTicketsId()));
                         ticketRelationsMapper.update(ticketRelations, new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", tickets.getTicketsId()));

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

@@ -386,7 +386,7 @@ public class DataImpl {
                             ticketPartnerVo.setUseStart(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseStart()));
                             ticketPartnerVo.setUseEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseEnd()));
                             ticketPartnerVo.setDescribes(tickets.getDescribes());
-                            ticketPartnerVo.setDescribesExpress(tickets.getDescribeExpress());
+                            ticketPartnerVo.setDescribeExpress(tickets.getDescribeExpress());
                             ticketPartnerVo.setDescribeElectronic(tickets.getDescribeElectronic());
                             ticketPartnerVo.setStatus(ticketStatus.getStatus());
                             ticketPartnerVo.setIsShowCode(ticketStatus.getIsShowCode());

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

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.CommonConst;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -15,6 +16,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -40,6 +42,7 @@ import java.util.stream.Collectors;
  * @since 2021-05-11
  */
 @Service
+@Slf4j
 public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService {
 
     @Autowired
@@ -108,6 +111,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", 0);
         info.put("list", performancesListNew);
 
+        log.info(UserPathDto.setData("演出列表",cityName+"/"+type+"/"+isDiscount+"/"+isAdvance+"/"+"/"+isExclusive,info));
         return info;
     }
 
@@ -157,6 +161,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo.setDiffDistance(diffDistance);
         }
 
+        log.info(UserPathDto.setData("演出详情",performancesId+"/"+latitudeFrom+"/"+longitudeFrom,performancesInfo));
         return performancesInfo;
     }
 
@@ -273,6 +278,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", count);
         info.put("list", list);
 
+        log.info(UserPathDto.setData("演出搜索",title+"/"+page+"/"+size,info));
         return info;
     }
 
@@ -299,6 +305,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         PayDetailVo payDetailVo = new PayDetailVo();
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);
+
+        log.info(UserPathDto.setData("预支付",performancesId+"/"+ticketsId,payDetailVo));
         return payDetailVo;
     }
 

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

@@ -18,7 +18,6 @@ import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
@@ -113,12 +112,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setStatus(0);
             kylinTicketPartnerVo.setDefault();
             if (ticketCreateParam.getIsExpress() == 1) {
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
+                kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
             } else {
-                kylinTicketPartnerVo.setDescribesExpress("");
+                kylinTicketPartnerVo.setDescribeExpress("");
             }
             if (ticketCreateParam.getIsElectronic() == 1) {
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
             } else {
                 kylinTicketPartnerVo.setDescribeElectronic("");
             }
@@ -163,12 +162,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
             if (ticketCreateParam.getIsExpress() == 1) {
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
+                kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
             } else {
-                kylinTicketPartnerVo.setDescribesExpress("");
+                kylinTicketPartnerVo.setDescribeExpress("");
             }
             if (ticketCreateParam.getIsElectronic() == 1) {
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
             } else {
                 kylinTicketPartnerVo.setDescribeElectronic("");
             }
@@ -217,10 +216,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setTimesId(null);
             kylinTicketPartnerVo.setStatus(null);
             if (ticketCreateParam.getIsExpress() == 1) {
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
+                kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
             }
             if (ticketCreateParam.getIsElectronic() == 1) {
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
             }
 
             kylinTicketPartnerVo.setDefault();

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

@@ -32,7 +32,6 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -330,7 +329,7 @@ public class PerformanceVoTask {
                     tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd())));
                     if (ticketItem.getIsExpress() == 1) {
                         tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
-                        tickets.setDescribeExpress(ticketItem.getDescribesExpress());
+                        tickets.setDescribeExpress(ticketItem.getDescribeExpress());
                     }
                     if (ticketItem.getIsElectronic() == 1) {
                         tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
@@ -422,7 +421,7 @@ public class PerformanceVoTask {
                             return true;
                         }else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
                             return true;
-                        }else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribesExpress())) {
+                        }else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribeExpress())) {
                             return true;
                         }if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
                             return true;